Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей" #166

Merged
SemenovaMasha merged 2 commits from 18-paper-timeline into dev 2019-03-30 11:12:27 +04:00

2 Commits

Author SHA1 Message Date
Семенова Мария
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
Семенова Мария
2f0c461524 #18 add paper events 2019-03-28 12:40:10 +04:00