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

Merged
SemenovaMasha merged 2 commits from 18-paper-timeline into dev 5 years ago

2 Commits (dev)

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
5 years ago
Семенова Мария 2f0c461524 #18 add paper events 5 years ago