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

# Conflicts: # cps/static/css/style.css
7 years ago · 3366aae6c7
parent e5b4bed01c 9a17a09cc7
commit 3366aae6c7
1 changed files with 3 additions and 0 deletions
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@ -93,3 +93,6 @@ input.pill:not(:checked) + label .glyphicon {
 .upload-format-input-text {display: initial;}
 #btn-upload-format {display: none;}
 .upload-format-input-text {display: initial;}
 #btn-upload-format {display: none;}