Konrad Langenberg 30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea ... Signed-off-by: Konrad <konrad@kola-entertainments.de> # Conflicts: # models/migrations/migrations.go # models/migrations/v46.go # models/repo.go # public/js/index.js		2017-10-30 21:17:36 +01:00
..
admin	Show Sendmail settings on admin config page (#2782)	2017-10-26 16:47:16 +08:00
base	Add Safari pinned tab icon (#2799)	2017-10-28 20:01:42 -05:00
explore	Change default sort order (#2647)	2017-10-05 08:02:43 +03:00
mail	Fix copy in email templates (#2801)	2017-10-29 23:57:05 +02:00
org	fix discord hook bug (#2778)	2017-10-25 13:13:45 +08:00
repo	Merge branch 'master' of https://github.com/go-gitea/gitea	2017-10-30 21:17:36 +01:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Fix tabs according to semantic-ui docs (#2733)	2017-10-18 21:18:31 +03:00
home.tmpl	Link to gitea-specific Vagrant example (#2624)	2017-09-30 08:50:19 +08:00
install.tmpl	Resolved Conflicts	2017-09-12 14:19:20 +02:00
swagger.tmpl	Move swagger-ui under /api/v1 (#2746)	2017-10-21 22:05:50 +08:00