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
..
admin	merge into master	2018-04-10 15:46:43 +02:00
base	Rework special link parsing in the post-processing of markup (#3354)	2018-02-27 09:09:18 +02:00
custom	Templates for extra links in top navbar and repo tool tabs. (#3308)	2018-01-10 08:19:50 +02:00
explore	Add topic support (#3711)	2018-04-11 10:51:44 +08:00
mail	Mention the possibility of resetting the password for new accounts (#3812)	2018-04-19 09:08:51 +08:00
org	Don't warn users about *every* dirty form (#3707)	2018-03-23 22:10:42 +08:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2018-04-29 11:25:56 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Shows total tracked time in issue and milestone list (#3341)	2018-04-29 13:58:47 +08:00
home.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00
install.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00
swagger.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00