Merge branch 'develop' into feature/date-filter
# Conflicts:
#	src/Form/Activity/ActivityFilterForm.php
commit 564e07866005c861a1bd74eadb45adf628441a80
2 parents ec11c89 + c99a5b6
@Kilian Riou Kilian Riou authored on 7 Apr 2021
Showing 2 changed files
View
src/Form/Activity/ActivityFilterForm.php
View
templates/_includes/html/form/activity/filter.html.twig