Merge branch 'develop' into feature/tasks
# Conflicts:
#	templates/_includes/html/arrays/activity.html.twig
commit 78e03b44fd0d1b82521133f23b058cd63ad663ea
2 parents ccfbc84 + 7c0ce3b
@Kilian Riou Kilian Riou authored on 23 Apr 2021
Showing 2 changed files
View
templates/_includes/html/arrays/activity.html.twig
View
templates/_includes/html/arrays/actor.html.twig