orion/filecodebox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into test/custom-admin-ui

Browse Source 
# Conflicts:
#	.gitignore
#	Dockerfile
#	apps/admin/services.py
#	apps/admin/views.py
#	apps/base/models.py
#	apps/base/views.py
#	core/settings.py
This commit is contained in:
Orion
2026-06-05 17:01:32 +08:00
parent 85af153b38 e3ea7825bf
commit f613d9f69e
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/settings.py
+1 -1
View File
@@ -104,4 +104,4 @@ class Settings:
return {**self.default_config, **self.user_config}.items()
settings = Settings(DEFAULT_CONFIG)
settings = Settings(DEFAULT_CONFIG)