Anton Romanov e7b84b766f Merge branch 'move-to-jdk11' into try-vue ... # Conflicts: # src/main/java/ru/ulstu/configuration/MvcConfiguration.java # src/main/java/ru/ulstu/core/controller/AdviceController.java # src/main/java/ru/ulstu/paper/controller/PaperRestController.java # src/main/resources/static/papers/paper-status.vue # src/main/resources/templates/activate.html # src/main/resources/templates/admin/commits.html # src/main/resources/templates/admin/userList.html # src/main/resources/templates/admin/userSessions.html # src/main/resources/templates/conferences/conference.html # src/main/resources/templates/conferences/conferences.html # src/main/resources/templates/conferences/dashboard.html # src/main/resources/templates/default.html # src/main/resources/templates/error/403.html # src/main/resources/templates/error/404.html # src/main/resources/templates/error/500.html # src/main/resources/templates/grants/dashboard.html # src/main/resources/templates/grants/fragments/grantDashboardFragment.html # src/main/resources/templates/grants/fragments/grantLineFragment.html # src/main/resources/templates/grants/fragments/grantStatusFragment.html # src/main/resources/templates/grants/grant.html # src/main/resources/templates/grants/grants.html # src/main/resources/templates/index.html # src/main/resources/templates/load.html # src/main/resources/templates/login.html # src/main/resources/templates/papers/dashboard.html # src/main/resources/templates/papers/fragments/paperDashboardFragment.html # src/main/resources/templates/papers/fragments/paperLineFragment.html # src/main/resources/templates/papers/paper.html # src/main/resources/templates/papers/papers.html # src/main/resources/templates/projects/dashboard.html # src/main/resources/templates/projects/fragments/projectStatusFragment.html # src/main/resources/templates/projects/project.html # src/main/resources/templates/projects/projects.html # src/main/resources/templates/reset.html # src/main/resources/templates/resetRequest.html # src/main/resources/templates/timeline.html		2019-06-24 15:12:56 +04:00
..
gdccloud	different drivers	2019-06-06 17:07:25 +04:00
run_psql.sh	try-vue: add pgsql runner	2019-05-28 22:27:35 +04:00