Семенова Мария a2dca6b7c6 Merge branch 'dev' into paper-latex-editing ...

# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
#	src/main/resources/templates/papers/paper.html

2019-04-18 18:20:51 +04:00

..

java/ru/ulstu

Merge branch 'dev' into paper-latex-editing

2019-04-18 18:20:51 +04:00

resources

Merge branch 'dev' into paper-latex-editing

2019-04-18 18:20:51 +04:00