You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
parallel-library/cps/translations
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
6 years ago
..
de/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
es/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
fr/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
hu/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
it/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
ja/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
km/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
nl/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
pl/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
ru/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
sv/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
uk/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
zh_Hans_CN/LC_MESSAGES Merge branch 'master' into Develop 6 years ago
iso639.pickle Fixes Google Drive 6 years ago