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
..
controller	#42 delete blank lines, fix js, fix leaderId validation	2019-04-17 13:25:10 +04:00
model	Merge branch 'dev' into move-to-jdk11	2019-04-23 11:35:41 +04:00
repository	#42 filter authors by leader and degree	2019-04-13 12:39:53 +04:00
service	Merge branch 'dev' into move-to-jdk11	2019-04-23 11:35:41 +04:00