Семенова Мария 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

..

java/ru/ulstu

Merge branch 'dev' into 33-paper-url

2019-03-23 12:04:51 +04:00

resources

Merge branch 'dev' into 33-paper-url

2019-03-23 12:04:51 +04:00