Anton Romanov 76d4c15db5 Merge branch '18-paper-timeline' into 'dev' ... Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей" Closes #18 See merge request romanov73/ng-tracker!39		2019-03-30 07:12:26 +00:00
..
db	Merge branch 'dev' into 18-paper-timeline	2019-03-28 18:32:44 +04:00
mail_templates	add links to papers	2019-03-01 11:22:25 +04:00
public	Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'	2019-03-30 07:10:47 +00:00
static	add big logo	2018-05-04 18:09:29 +04:00
templates	Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'	2019-03-30 07:10:47 +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