Anton Romanov 5ffb2d547e Merge branch 'dev' into 81-students-create-database ...

# Conflicts:
#	src/main/resources/db/changelog-master.xml

2019-04-01 09:42:40 +04:00

..

db

Merge branch 'dev' into 81-students-create-database

2019-04-01 09:42:40 +04:00

mail_templates

add links to papers

2019-03-01 11:22:25 +04:00

public

Merge branch '71-add-task-layout' into 'dev'

2019-04-01 05:17:39 +00:00

static

add big logo

2018-05-04 18:09:29 +04:00

templates

Merge branch '71-add-task-layout' into 'dev'

2019-04-01 05:17:39 +00:00

application.properties

fix props

2019-03-06 14:36:46 +03: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