7 Commits

Author SHA1 Message Date
Anton Romanov
df1bf873ff fix warnings 2019-06-22 13:31:53 +04:00
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
T-Midnight
f7d766f02d #42 rename birth_date column 2019-04-11 21:37:24 +04:00
T-Midnight
e8461e26eb #42 fix birthDate and degree to User 2019-04-10 10:09:41 +04:00
T-Midnight
7465803162 #42 add columns 'birth_date'&'degree' to User 2019-04-05 22:06:16 +04:00
Anton Romanov
e74261184f #73 first fixes by update versions 2019-03-20 14:37:57 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00