Skip to content
Snippets Groups Projects
Commit 0a40a2f6 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

Merge branch 'master' into 'performances' 

# Conflicts:
#   README.md
#   djangoldp/tests/settings_default.py
parents f7362015 e3ffeae2
Pipeline #7956 passed with stage
in 26 seconds
Hide whitespace changes
Inline Side-by-side
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