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

Merge branch 'master' into 'jbpasquier/template-mail'

# Conflicts:
#   djangoldp_notification/models.py
parents 90e3e71d 615f36b5
No related branches found
No related tags found
1 merge request!11ui: Add email template & change model for author_user
Pipeline #1519 passed