Nightblade73 713e50043e Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf ... # Conflicts: # src/main/resources/db/changelog-master.xml		2019-04-19 14:24:32 +04:00
..
db	Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf	2019-04-19 14:24:32 +04:00
drivers	#102 add auto tests	2019-04-17 17:20:20 +04:00
mail_templates	add links to papers	2019-03-01 11:22:25 +04:00
public	Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf	2019-04-19 14:24:32 +04:00
static	add big logo	2018-05-04 18:09:29 +04:00
templates	Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf	2019-04-19 14:24:32 +04:00
application.properties	Revert: #42 merge with dev	2019-04-17 13:42:22 +04:00
commits.log	fix displaying commits	2019-03-28 15:53:31 +03:00
sample.jks	add java code	2018-05-04 17:08:20 +04:00