Torkel Ödegaard 9ff4ab1236 Merge branch 'master' into query_troubleshooting преди 8 години
..
defaults.ini c34db77f04 grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415 преди 8 години
ldap.toml a79102b42d Fix ldap ca_cert example/docs for proper syntax (#8044) преди 8 години
sample.ini 9ff4ab1236 Merge branch 'master' into query_troubleshooting преди 8 години