Skip to content
Snippets Groups Projects
Commit 267fec8e authored by Manon Bourgognon's avatar Manon Bourgognon
Browse files

Merge branch 'djangoldp/settings' into 'master' 

Update settings with resolution order

See merge request !86
parents b738a65f 6e9581ff
No related branches found
No related tags found
Pipeline #11917 passed with stage
in 42 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 1187 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment