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

..

defaults.ini

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

2015-12-11 15:16:57 +01:00

ldap.toml

feat(ldap): refactoring of PR #2928 updated docs

2015-10-26 16:21:03 +01:00

sample.ini

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

2015-12-11 15:16:57 +01:00