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
..
2018-05-04 17:08:20 +04:00
2019-04-25 17:12:39 +04:00
2019-04-25 21:17:48 +04:00
2019-04-30 10:43:36 +04:00
2019-04-25 19:15:19 +04:00
2019-04-25 19:15:19 +04:00
2018-06-10 01:49:38 +04:00
2019-05-09 01:21:56 +04:00
2019-05-08 23:32:37 +04:00
2019-05-09 01:21:56 +04:00
2019-05-09 01:21:56 +04:00
2019-04-26 10:37:50 +04:00
2019-03-01 11:21:25 +04:00
2019-03-01 11:21:25 +04:00
2019-03-01 11:22:25 +04:00
2019-05-16 00:38:53 +04:00
2019-05-19 00:42:24 +04:00
2019-05-31 00:33:21 +04:00
2019-06-21 04:22:06 +04:00