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
1 merge request!86Update settings with resolution order
Pipeline #11917 passed with stage
in 42 seconds