public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gnet-oauth

Browse Source 
Conflicts:
	pkg/api/login_oauth.go
This commit is contained in:
Dan Cech
2016-09-21 09:39:35 -04:00
parent 630a8ed8aa 9e26a4cfcb
commit b387c1291d
72 changed files with 3878 additions and 2450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/defaults.ini
+1 -1
View File
@@ -413,7 +413,7 @@ url = https://grafana.net
#################################### External Image Storage ##############
[external_image_storage]
# You can choose between (s3, webdav or internal)
# You can choose between (s3, webdav)
provider = s3
[external_image_storage.s3]