kolaente 67f66d6bb5 Resolved Conflicts ... Signed-off-by: Konrad <konrad@kola-entertainments.de>		2017-09-12 14:19:20 +02:00
..
admin.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
auths.go	LDAP user synchronization (#1478)	2017-05-10 15:10:18 +02:00
notice.go	Golint fixed for modules/setting (#262)	2016-11-27 18:14:25 +08:00
orgs.go	Added sorting to organizations, repos & users page (#222)	2016-12-24 22:42:26 +08:00
repos.go	Resolved Conflicts	2017-09-12 14:19:20 +02:00
users.go	feat: Able to disable non-admin to create new organization (#927)	2017-02-14 20:16:00 +08:00