Merge branch 'develop' into feature/hosting_permission
This commit is contained in:
commit
3e6502133e
24 changed files with 638 additions and 61 deletions
|
|
@ -137,7 +137,8 @@ TEMPLATES = [
|
|||
os.path.join(PROJECT_DIR, 'hosting/templates/'),
|
||||
os.path.join(PROJECT_DIR, 'ungleich/templates/djangocms_blog/'),
|
||||
os.path.join(PROJECT_DIR, 'ungleich/templates/cms/ungleichch'),
|
||||
os.path.join(PROJECT_DIR, 'ungleich/templates/ungleich')
|
||||
os.path.join(PROJECT_DIR, 'ungleich/templates/ungleich'),
|
||||
os.path.join(PROJECT_DIR, 'ungleich_page/templates/ungleich_page')
|
||||
|
||||
],
|
||||
'APP_DIRS': True,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue