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

Merged

al-f merged 1 commits from 3-ui into master 2018-09-27 10:08:53 +04:00

Conversation 6 Commits 1 Files Changed 2 +13 -12

1 Commits

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	2018-09-27 10:03:00 +04:00