Merge branch 'develop' into feature/tasks
# Conflicts: # src/Controller/ActorController.php # templates/activity/activity.html.twig |
---|
changelog.md |
---|
src/Controller/ActivityController.php |
---|
src/Controller/ActorController.php |
---|
templates/_includes/html/form/activity/add.html.twig |
---|
templates/activity/activity.html.twig |
---|
templates/actor/actor.html.twig |
---|