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
Loading
Checking pipeline status
Showing
with 20 additions and 1187 deletions
Loading
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