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		2019-07-13 20:54:21 +02:00
..
images
bar-ui.css
bootstrap-datepicker3.css.map
bootstrap-datepicker3.min.css
bootstrap-editable.css
bootstrap-table.min.css
bootstrap-theme.min.css
bootstrap-theme.min.css.map
bootstrap.min.css
bootstrap.min.css.map
normalize.css
typeahead.css
viewer.css