Skip to content
Snippets Groups Projects
Commit 3472f7bd authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'bugfix/merge-settings' into 'master'

Bug fix for merge_app_settings

See merge request AlekSIS/AlekSIS!127
parents 17fdddf8 d879bae3
No related branches found
No related tags found
1 merge request!127Bug fix for merge_app_settings
Pipeline #683 canceled
......@@ -47,7 +47,7 @@ def merge_app_settings(setting: str, original: Union[dict, list], deduplicate: b
for pkg in get_app_packages():
try:
mod_settings = import_module(pkg)
mod_settings = import_module(pkg + ".settings")
except ImportError:
# Import errors are non-fatal. They mean that the app has no settings.py.
continue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment