Merge branch 'develop' into feature/tasks
# Conflicts:
#	src/Controller/ActorController.php
#	templates/activity/activity.html.twig
commit c82616faf7649fcf4b1034e719cd24e31a83ec45
2 parents 666a0ee + 4cd53d1
@Kilian Riou Kilian Riou authored on 23 Apr 2021
Showing 6 changed files
View
changelog.md
View
src/Controller/ActivityController.php
View
src/Controller/ActorController.php
View
templates/_includes/html/form/activity/add.html.twig
View
templates/activity/activity.html.twig
View
templates/actor/actor.html.twig