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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment