Anton Romanov 36c4e52e37 Merge branch 'dev' into move-to-jdk11 ... # Conflicts: # src/main/java/ru/ulstu/conference/service/ConferenceService.java # src/main/java/ru/ulstu/grant/model/Grant.java # src/main/java/ru/ulstu/grant/service/GrantService.java # src/main/java/ru/ulstu/paper/model/Paper.java # src/main/java/ru/ulstu/paper/service/PaperService.java # src/main/java/ru/ulstu/project/model/Project.java # src/main/java/ru/ulstu/project/model/ProjectDto.java # src/main/java/ru/ulstu/students/model/Task.java # src/main/java/ru/ulstu/students/service/TaskService.java # src/main/java/ru/ulstu/timeline/model/Event.java # src/main/java/ru/ulstu/timeline/model/EventDto.java # src/main/java/ru/ulstu/timeline/service/EventService.java # src/main/java/ru/ulstu/user/service/UserService.java # src/main/resources/application.properties # src/main/resources/db/changelog-master.xml # src/main/resources/public/css/conference.css # src/main/resources/public/js/conference.js # src/main/resources/public/js/tasks.js # src/main/resources/templates/conferences/conference.html # src/main/resources/templates/grants/grant.html # src/main/resources/templates/papers/paper.html		2019-06-21 04:22:06 +04:00
..
main	Merge branch 'dev' into move-to-jdk11	2019-06-21 04:22:06 +04:00
test/java	Merge branch 'dev' into move-to-jdk11	2019-06-21 04:22:06 +04:00