Merge branch 'Develop'

Browse Source

# 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

...

This commit is contained in:

Ozzieisaacs

2019-07-13 20:45:48 +02:00

parent 37736e11d5

commit 4708347c16

189 changed files with 33354 additions and 17681 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

6294

cps/static/js/libs/soundmanager2.js vendored Normal file

File diff suppressed because it is too large Load Diff