Torkel Ödegaard 0e44fe082b Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

..

alerting

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00

annotations

Create annotations (#8197)

2017-10-07 10:31:39 +02:00

cleanup

refactoring: minor refactor of clean up dashboard history PR #9882

2017-11-17 14:41:44 +01:00

guardian

dashboard acl fixes

2017-06-22 17:43:55 -04:00

notifications

Merge pull request #9367 from bobrik/dualstack

2017-09-28 11:15:49 +02:00

provisioning

datasources as cfg: convert yaml map into json for jsonData

2017-11-16 13:23:42 +01:00

search

added code from #8504, and #8021

2017-06-23 17:13:58 -04:00

sqlstore

Merge branch 'master' into develop

2017-11-17 15:49:17 +01:00