Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot

...

This commit is contained in:

Ozzieisaacs

2019-03-10 08:31:10 +01:00

parent 9144a7ceb9 76d40411dd

commit da3fcb9a72

29 changed files with 13482 additions and 11851 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

messages.pot

+939 -751

File diff suppressed because it is too large Load Diff