mirror of
https://github.com/JonathanHerrewijnen/calibre-web.git
synced 2024-09-22 06:02:27 +00:00
Merge remote-tracking branch 'ldap/Develop' into Develop
# Conflicts: # cps/admin.py # cps/web.py
This commit is contained in:
commit
404be948d4