Skip to content
Snippets Groups Projects
Commit c71144f2 authored by Thibaud Duquennoy's avatar Thibaud Duquennoy
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git.happy-dev.fr:startinblox/djangoldp-packages/djangoldp into 99-author-perms

# Conflicts:
#	djangoldp/permissions.py
#	djangoldp/serializers.py
parents 5ea8203a 3a705899
No related branches found
No related tags found
1 merge request!36Resolve "auto_author gives permission to everybody???"
Pipeline #839 failed