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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	cps/static/css/style.css
This commit is contained in:
Ozzie Isaacs
2021-03-14 14:06:33 +01:00
parent b9c0c8d2dc 9b80c84794
commit f77d72fd86
24 changed files with 547 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/constants.py
+1 -1
View File
@@ -126,7 +126,7 @@ LDAP_AUTH_SIMPLE = 0
DEFAULT_MAIL_SERVER = "mail.example.org"
DEFAULT_PASSWORD = "admin123"
DEFAULT_PASSWORD = "admin123" # nosec # noqa
DEFAULT_PORT = 8083
env_CALIBRE_PORT = os.environ.get("CALIBRE_PORT", DEFAULT_PORT)
try: