Torkel Ödegaard 876bb08b05 Merge branch 'develop' of github.com:grafana/grafana into develop 8 lat temu
..
core 876bb08b05 Merge branch 'develop' of github.com:grafana/grafana into develop 8 lat temu
features 876bb08b05 Merge branch 'develop' of github.com:grafana/grafana into develop 8 lat temu
headers 9ff4ab1236 Merge branch 'master' into query_troubleshooting 8 lat temu
partials 9ff4ab1236 Merge branch 'master' into query_troubleshooting 8 lat temu
plugins 1e064f6c19 WIP: first draft of permissionlist panel 8 lat temu
app.ts 6f87f88690 tech(lib upgrade): upgraded angularjs from 1.5.8 to 1.6.1, closes #7274 9 lat temu
boot.js dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 10 lat temu
system.conf.js 5513d3c9d1 feat: moved json-formatter-js into core grafana to be able to make changes 8 lat temu