Anton Romanov 60dfad5d76 Merge branch 'dev' into move-to-jdk11 ... # Conflicts: # src/main/resources/db/changelog-master.xml		2019-04-23 13:51:21 +04:00
..
ProjectController.java	Merge branch 'dev' into move-to-jdk11	2019-04-23 13:51:21 +04:00