Jonas Franz 6d00c1a7ce Merge branch 'master' into feat/approval-new ... # Conflicts: # models/issue_comment.go # models/migrations/migrations.go # models/migrations/v64.go # models/models.go # public/css/index.css		2018-05-13 22:14:34 +02:00
..
add_reaction.tmpl	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
comments.tmpl	Merge branch 'master' into feat/approval-new	2018-05-13 22:14:34 +02:00
pull.tmpl	Added checks for protected branches in pull requests (#3544)	2018-03-13 11:46:14 +08:00
reactions.tmpl	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
sidebar.tmpl	Fixed issue deadline not showing on issue page (#3930)	2018-05-10 07:05:12 +03:00