Merge branch 'master' into 5151/gdpr_modal

This commit is contained in:
PCoder 2019-01-30 21:05:34 +01:00
commit 16b5f1e5a4
12 changed files with 131 additions and 9 deletions

View file

@ -56,7 +56,9 @@ dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR))
from multisite import SiteID
SITE_ID = SiteID(default=1)
UNGLEICH_BLOG_SITE_ID = int_env("UNGLEICH_BLOG_SITE_ID")
SITE_ID = SiteID(default=(UNGLEICH_BLOG_SITE_ID if
UNGLEICH_BLOG_SITE_ID > 0 else 1))
APP_ROOT_ENDPOINT = "/"
APPEND_SLASH = True