sample.ini
7.08 KB
-
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints · fab1062c
Conflicts: conf/defaults.ini pkg/setting/setting.go closes #2571 closes #2494
carl bergquist committed
Conflicts: conf/defaults.ini pkg/setting/setting.go closes #2571 closes #2494