Merge branch 'master' into Develop

Browse Source

# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering

...

This commit is contained in:

Ozzieisaacs

2019-02-24 10:39:37 +01:00

parent e92497b34e 0facb8fffa

commit cc3088c52f

14 changed files with 491 additions and 497 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

cps/static/css/caliBlur.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long