Commit 3366aae6 authored by kyos's avatar kyos

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

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

# Conflicts:
#	cps/static/css/style.css
parents e5b4bed0 9a17a09c
......@@ -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;}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment