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
..
db	add paper authors	2018-05-05 14:49:34 +04:00
mail_templates	add java code	2018-05-04 17:08:20 +04:00
public	Merge branch 'master' into 3-ui	2018-09-27 10:02:49 +04:00
static	add big logo	2018-05-04 18:09:29 +04:00
templates	Merge branch 'master' into 3-ui	2018-09-27 10:02:49 +04:00
application.properties	add ci	2018-05-04 17:54:46 +04:00
commits.log	add java code	2018-05-04 17:08:20 +04:00
sample.jks	add java code	2018-05-04 17:08:20 +04:00