Mustapha Zorgati 850ad5f724 Merge remote-tracking branch 'refs/remotes/origin/master' ... Conflicts: history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/AbstractAccTest.java		2021-01-07 14:53:59 +01:00
..
src	Merge remote-tracking branch 'refs/remotes/origin/master'	2021-01-07 14:53:59 +01:00
pom.xml	TSK-1492: automatically update taskana dependency for wildfly during release build	2020-12-18 09:13:53 +01:00