Skip to content
Snippets Groups Projects
Commit 99d3ba9c authored by Pierre-antoine Comby's avatar Pierre-antoine Comby
Browse files

Merge branch 'master' into 'explicit>implicit'

# Conflicts:
#   apps/activity/views.py
parents 7e0aac01 0e082995
No related branches found
No related tags found
1 merge request!75Explicit>implicit
Pipeline #8119 passed with warnings with stages
in 3 minutes and 58 seconds