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

Merge branch 'master' into 'jbpasquier/slugs'

# Conflicts:
#   djangoldp/models.py
parents bf297e9b 32f181ad
No related branches found
No related tags found
1 merge request!101update: migrate user meta to djangoldp-account
Pipeline #1155 passed with stage
in 1 minute and 26 seconds