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

Merge branch 'master' into 'fix_distinct'

# Conflicts:
#   apps/activity/views.py
parents 9fbfac7b 0e082995
No related branches found
No related tags found
1 merge request!74distinct on field not supported by sqlite
Pipeline #8118 passed with stages
in 4 minutes