oscarleiva/energylink

Torkel Ödegaard 9ff4ab1236 Merge branch 'master' into query_troubleshooting		%!s(int64=8) %!d(string=hai) anos
..
defaults.ini	c34db77f04 grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415	%!s(int64=8) %!d(string=hai) anos
ldap.toml	a79102b42d Fix ldap ca_cert example/docs for proper syntax (#8044)	%!s(int64=8) %!d(string=hai) anos
sample.ini	9ff4ab1236 Merge branch 'master' into query_troubleshooting	%!s(int64=8) %!d(string=hai) anos