Anton Romanov 7684bac74d Merge branch 'dev' into move-to-jdk11 ... # Conflicts: # build.gradle # src/main/java/ru/ulstu/grant/model/GrantDto.java # src/main/java/ru/ulstu/grant/service/GrantService.java # src/main/java/ru/ulstu/paper/model/PaperDto.java # src/main/java/ru/ulstu/project/model/Project.java		2019-04-23 11:35:41 +04:00
..
main	Merge branch 'dev' into move-to-jdk11	2019-04-23 11:35:41 +04:00
test/java	#102 fix code style	2019-04-17 17:26:54 +04:00