External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 01:58:09 -03:30
Code Issues Packages Projects Releases Wiki Activity

LoadConfig fix to load config.js first and then local_settings.json

Browse Source
This commit is contained in:
Jared Tabor
2015-09-16 16:36:36 -04:00
parent fdace7e10d
commit f88320a5f7
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -12,7 +12,7 @@ awx/public/media
awx/public/static
awx/ui/tests/test-results.xml
awx/ui/static/js/awx.min.js
awx/ui/static/js/local_config.js
awx/ui/static/js/local_settings.json
awx/ui/static/css/awx.min.css
awx/main/fixtures
awx/*.log