Семенова Мария 030e1a3afb Merge branch 'dev' into 18-paper-timeline ...

# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/resources/db/changelog-master.xml

2019-03-28 18:32:44 +04:00

..

PaperCreateStrategy.java

move class

2018-11-11 12:43:27 +04:00

PaperNotificationService.java

fix notifications

2019-01-05 08:01:07 +04:00

PaperScheduler.java

fix notifications

2019-01-05 08:01:07 +04:00

PaperService.java

Merge branch 'dev' into 18-paper-timeline

2019-03-28 18:32:44 +04:00