Anton Romanov ac569ed9a9 Merge branch 'master' into 46-mvc ...

# Conflicts:
#	src/main/java/ru/ulstu/paper/controller/PaperController.java
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/resources/public/js/papers.js
#	src/main/resources/templates/papers/paper.html
#	src/main/resources/templates/papers/papers.html

2018-12-14 16:00:33 +04:00

..

db

Merge branch 'master' into 46-mvc

2018-12-14 16:00:33 +04:00

mail_templates

move classes, add deadline to entities, fix db changelogs

2018-12-11 15:08:35 +04:00

public

Merge branch 'master' into 46-mvc

2018-12-14 16:00:33 +04:00

static

add big logo

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

templates

Merge branch 'master' into 46-mvc

2018-12-14 16:00:33 +04:00

application.properties

add styles in email templates

2018-11-09 14:53:24 +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