4 Commits (746b7b1262799536514cff0b6f5725f036d29c76)

Author	SHA1	Message	Date
Ozzieisaacs	4708347c16	Merge branch 'Develop' ... # Conflicts: # MANIFEST.in # README.md # cps/helper.py # cps/static/js/archive/archive.js # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/updater.py # cps/web.py # cps/worker.py # optional-requirements.txt	6 years ago
Ozzieisaacs	6a7b8c7870	Update Version info ... Fix #816 Clarified licences for isolanguages.py and reverseproxy.py	6 years ago
Daniel Pavel	858c80bb20	'except' style fix	6 years ago
Daniel Pavel	f7e640fd98	support pycountry if iso-639 is not available	6 years ago