1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-02-13 13:59:05 +02:00
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
2020-04-05 17:31:41 +02:00
..
2019-07-13 20:54:21 +02:00
2020-02-23 07:54:58 +01:00
2020-03-31 08:42:08 -07:00
2019-01-20 19:37:45 +01:00
2019-07-13 20:54:21 +02:00
2020-04-04 08:53:22 +02:00
2019-06-17 19:48:17 +02:00
2020-03-29 16:44:24 +02:00
2020-03-29 16:44:24 +02:00
2019-07-13 20:54:21 +02:00