Merge branch 'master' into Develop
# 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
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
Please
register
or
sign in
to comment