Daniel Lee bc5fae5367 dashfolders: merge conflict

2018-01-25 14:54:50 +01:00

..

alerting

Update OpsGenie Notifier to support different api domains.

2018-01-22 22:27:35 +03:00

annotations

dashfolders: permissions for saving annotations

2018-01-09 14:44:36 +01:00

cleanup

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

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

dashboards

removes unused property

2017-12-13 13:12:50 +01:00

guardian

dashfolders: stop user locking themselves out of a folder

2018-01-18 14:30:04 +01:00

notifications

Merge pull request #9367 from bobrik/dualstack

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

provisioning

fixes minor typo

2018-01-25 09:30:37 +01:00

search

search: worked on search results

2017-12-13 15:51:59 +01:00

sqlstore

dashfolders: merge conflict

2018-01-25 14:54:50 +01:00