Anton Romanov d721907c24 Merge branch 'master' into 4-show-time-line ... # Conflicts: # src/main/resources/db/changelog-master.xml		2018-10-30 23:29:18 +04:00
..
db	Merge branch 'master' into 4-show-time-line	2018-10-30 23:29:18 +04:00
mail_templates	send notification	2018-06-10 01:49:38 +04:00
public	fix buttons size	2018-10-11 19:49:16 +04:00
static	add big logo	2018-05-04 18:09:29 +04:00
templates	Merge branch 'master' into 4-show-time-line	2018-10-30 23:29:18 +04:00
application.properties	Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line	2018-10-30 23:04:49 +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