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
..
cypress	TSK-1395: Update Navbar to work without bootstrap 3 (#1288)	2020-10-14 16:39:22 +02:00
fixtures	TSK-1395: Update Navbar to work without bootstrap 3 (#1288)	2020-10-14 16:39:22 +02:00
integration	TSK-1362: Fixed the test data to not include invalid owners for Workbaskets (#1379)	2021-01-05 15:27:27 +01:00
plugins	TSK-1356: added cypress e2e testing	2020-08-11 15:41:50 +02:00
support	TSK-1395: Update Navbar to work without bootstrap 3 (#1288)	2020-10-14 16:39:22 +02:00