Resolve "Создать страницу для dashboard статей" #131

Merged
alefly merged 1 commits from 23-dashboard into master 2018-09-26 16:22:39 +04:00

1 Commits

Author SHA1 Message Date
Alyona
0814081187 Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:11:43 +04:00