Commit Graph

4 Commits

Author SHA1 Message Date
Anton Romanov
948305e4d9 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
2018-09-27 10:02:49 +04:00
Anton Romanov
3688423602 path to timeline 2018-09-08 09:53:34 +04:00
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00