Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book

# Conflicts:
#	cps/static/css/style.css
pull/272/head
kyos 7 years ago
commit 3366aae6c7

@ -93,3 +93,6 @@ input.pill:not(:checked) + label .glyphicon {
.upload-format-input-text {display: initial;} .upload-format-input-text {display: initial;}
#btn-upload-format {display: none;} #btn-upload-format {display: none;}
.upload-format-input-text {display: initial;}
#btn-upload-format {display: none;}

Loading…
Cancel
Save