carl bergquist fab1062c0b Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints ... Conflicts: conf/defaults.ini pkg/setting/setting.go closes #2571 closes #2494		2015-12-11 15:16:57 +01:00
..
setting_oauth.go	Add allow_sign_up override for auth.google/github.	2015-04-16 13:43:18 -08:00
setting_quota.go	move toMap function to be a method on the quota structs	2015-09-15 17:18:26 +08:00
setting_smtp.go	Final work password reset email, Closes #1456	2015-06-08 18:25:04 +02:00
setting_test.go	fix(tests): fixed failling backend test	2015-09-11 08:58:45 +02:00
setting.go	Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints	2015-12-11 15:16:57 +01:00