oscarleiva/energylink

bergquist 4646723cbb Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth		9 lat temu
..
setting.go	5ba6bab237 redact provider_config (#5915)	9 lat temu
setting_oauth.go	b4646b6c3a Allow users to use a generic oauth that conforms to the github style.	9 lat temu
setting_quota.go	86ed85aa6e move toMap function to be a method on the quota structs	10 lat temu
setting_smtp.go	bb2d810709 Final work password reset email, Closes #1456	10 lat temu
setting_test.go	aa064b18e8 Test environment override for secret and url with credentials	9 lat temu