kyos 3366aae6c7 Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book ...

# Conflicts:
#	cps/static/css/style.css

2017-09-11 10:48:57 +02:00

..

fonts

…

images

…

libs

…

main.css

…

popup.css

…

style.css

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

2017-09-11 10:48:57 +02:00