Jonas Franz 7592f5bbbd Merge branch 'master' into feat/approval-new ... # Conflicts: # models/migrations/migrations.go		2018-05-24 15:44:11 +02:00
..
ldap	LDAP Public SSH Keys synchronization (#1844)	2018-05-24 07:59:02 +03:00
oauth2	Store OAuth2 session data in database (#3660)	2018-04-29 09:09:24 +03:00
openid
pam
admin.go	Better URL validation (#1507)	2017-04-19 11:02:20 +08:00
auth.go	Refactor struct's time to remove unnecessary memory usage (#3142)	2017-12-11 06:37:04 +02:00
auth_form.go	LDAP Public SSH Keys synchronization (#1844)	2018-05-24 07:59:02 +03:00
org.go	Add units to team (#947)	2017-05-18 22:54:24 +08:00
repo_branch_form.go	Create new branch from branch selection dropdown (#2130)	2017-10-15 22:59:24 +03:00
repo_form.go	Merge branch 'master' into feat/approval-new	2018-05-17 14:00:21 +02:00
user_form.go	Add support for FIDO U2F (#3971)	2018-05-19 17:12:37 +03:00
user_form_auth_openid.go