Resolve "Интерфейс" #128

Merged
al-f merged 1 commits from 3-ui into master 6 years ago

1 Commits (dev)

Author SHA1 Message Date
Anton Romanov 879f388e66 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
6 years ago