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
No related branches found
Tags v0.0.14
Loading
Checking pipeline status