Семенова Мария c228f5aee0 Merge branch 'dev' into 33-paper-url
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
2019-03-23 12:04:51 +04:00
..
2019-03-12 14:44:11 +04:00
2018-10-30 23:26:55 +04:00
2018-10-31 20:06:27 +04:00