Torkel Ödegaard 0d083bad14 Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	pkg/components/imguploader/s3uploader.go

2016-09-07 10:14:36 +02:00

..

imguploader_test.go

test(imageupload): add more specific tests

2016-09-07 10:05:01 +02:00

imguploader.go

feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

2016-09-07 10:11:00 +02:00

s3uploader_test.go

test(imageupload): add more specific tests

2016-09-07 10:05:01 +02:00

s3uploader.go

feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

2016-09-07 10:11:00 +02:00

webdavuploader_test.go

feat(alerting): add support for uploading images to webdav.

2016-08-11 16:48:54 +02:00

webdavuploader.go

test(imageupload): add more specific tests

2016-09-07 10:05:01 +02:00