Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop ... # 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		2019-03-10 08:31:10 +01:00
..
de/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
es/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
fr/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
hu/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
it/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
ja/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
km/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
nl/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
pl/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
ru/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
sv/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
uk/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
zh_Hans_CN/LC_MESSAGES	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
iso639.pickle	Fixes Google Drive	2019-02-03 16:38:27 +01:00