Torkel Ödegaard 9ff4ab1236 Merge branch 'master' into query_troubleshooting

2017-06-13 16:47:04 -04:00

..

defaults.ini

grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415

2017-05-22 14:56:50 +02:00

ldap.toml

Fix ldap ca_cert example/docs for proper syntax (#8044)

2017-04-06 09:53:11 +02:00

sample.ini

Merge branch 'master' into query_troubleshooting

2017-06-13 16:47:04 -04:00