kolaente c0cd0c3710 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # options/locale/locale_en-US.ini		2018-04-29 11:25:56 +02:00
..
add_reaction.tmpl	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
comments.tmpl	merge into master	2018-04-10 15:46:43 +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	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-29 11:25:56 +02:00