kolaente 37dc550bc8 Merge branch 'master' of https://github.com/go-gitea/gitea ... # Conflicts: # docs/content/doc/advanced/config-cheat-sheet.en-us.md # models/migrations/migrations.go # models/migrations/v54.go # routers/repo/pull.go		2018-01-06 22:41:44 +01: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' of https://github.com/go-gitea/gitea	2017-12-19 19:07:30 +01:00
pull.tmpl	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)	2018-01-05 20:56:50 +02:00
reactions.tmpl	Add reactions to issues/PR and comments (#2856)	2017-12-04 01:14:26 +02:00
sidebar.tmpl	Fixed indent	2017-12-29 22:23:41 +01:00