Merge branch 'develop' into feature/tasks

Fork: 0

tools / activity-manager

Browse code Merge branch 'develop' into feature/tasks # Conflicts: # templates/_includes/html/arrays/activity.html.twig develop feature/project master v1.1.2 v1.1.1 v1.1.0
commit c0a47635157376ecc1bb14d21cfb59604b9a9d3f 2 parents 0f8ee2c + 6fdc453 Kilian Riou authored on 23 Apr 2021

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View changelog.md

Ignore Space Show notes View templates/_includes/html/arrays/activity.html.twig

Show line notes below