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

Merge branch 'master' into 'jbpasquier/permissions'

# Conflicts:
#   djangoldp/__init__.py
parents 5f588062 90655732
No related branches found
No related tags found
1 merge request!80update: Rewrite permissions
Pipeline #1017 passed