Torkel Ödegaard 07d78da5ec Merge branch 'ds_cache_refactor' of https://github.com/marefr/grafana into marefr-ds_cache_refactor %!s(int64=7) %!d(string=hai) anos
..
grafana-cli a4f5aafe22 Merge pull request #13422 from grafana/1815_admin_reset %!s(int64=7) %!d(string=hai) anos
grafana-server 07d78da5ec Merge branch 'ds_cache_refactor' of https://github.com/marefr/grafana into marefr-ds_cache_refactor %!s(int64=7) %!d(string=hai) anos