fix conflict in CHANGELOG

This commit is contained in:
nobohan
2021-11-08 12:41:11 +01:00
21 changed files with 287 additions and 127 deletions

View File

@@ -12,6 +12,9 @@ and this project adheres to
<!-- write down unreleased development here -->
* [person]: Add civility to the person
* [person]: Various improvements on the edit person form
* [person]: Set available_languages and available_countries as parameters for use in the edit person form
* [activity] Bugfix: documents can now be added to an activity.
* [tasks] improve tasks with filter order
* [tasks] refactor singleControllerTasks: limit the number of conditions from the context
@@ -35,6 +38,7 @@ and this project adheres to
## Test releases
### Test release 2021-10-27
* [person]: delete double actions buttons on search person page