Jonas Franz a8dc699e74 Merge branch 'master' into feat/approval-new ... # Conflicts: # models/error.go # models/migrations/migrations.go # models/models.go # public/js/index.js		2018-05-19 18:17:01 +02:00
..
admin	issue-2768: added new option allow_only_external_registration (#3910)	2018-05-13 15:51:16 +08:00
base	Add support for FIDO U2F (#3971)	2018-05-19 17:12:37 +03:00
custom	Templates for extra links in top navbar and repo tool tabs. (#3308)	2018-01-10 08:19:50 +02:00
explore	Fix blank topic on explore repo list (#3956)	2018-05-13 09:50:39 +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' into feat/approval-new	2018-05-17 14:00:21 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Add support for FIDO U2F (#3971)	2018-05-19 17:12:37 +03:00
home.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00
install.tmpl	issue-2768: added new option allow_only_external_registration (#3910)	2018-05-13 15:51:16 +08:00
swagger.tmpl	Spaces to tabs in templates (#2953)	2017-11-21 13:43:00 +08:00