Jonas Franz 7592f5bbbd Merge branch 'master' into feat/approval-new ... # Conflicts: # models/migrations/migrations.go		2018-05-24 15:44:11 +02:00
..
admin	LDAP Public SSH Keys synchronization (#1844)	2018-05-24 07:59:02 +03: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	Added repository search ordered by stars or forks. Forks column in admin repo list. (#3969)	2018-05-24 09:03:42 +08:00
mail	Mention the possibility of resetting the password for new accounts (#3812)	2018-04-19 09:08:51 +08:00
org	fix bugs caused by #3929 (#3999)	2018-05-23 15:23:23 +08:00
repo	Fix ui bug reported by @lunny causing wrong position of add button	2018-05-24 15:41:57 +02:00
status	Change import reference to match gitea instead of gogs (#37)	2016-11-03 10:29:56 -02:00
user	Added repository search ordered by stars or forks. Forks column in admin repo list. (#3969)	2018-05-24 09:03:42 +08: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