user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ldap/master' into Develop

Browse Source 
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
This commit is contained in:
Ozzieisaacs
2019-06-16 08:20:01 +02:00
parent d45b1b8ea5 4437d7376d
commit 9b74d51f21
10 changed files with 305 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.cfg
+1 -1
View File
@@ -81,6 +81,6 @@ metadata =
comics=
natsort>=2.2.0
# https://github.com/wildthyme/comicapi/archive/cb279168f9c5cec742b5a05ac8326b9c168a8a91.zip#egg=comicapi
# comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
# find solution for this