IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into websocket

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-17 10:16:05 +01:00
parent 79a803ea8f b2fe7e518f
commit 9ddf22ea93
11 changed files with 144 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -51,7 +51,7 @@
"karma-phantomjs-launcher": "0.2.1",
"load-grunt-tasks": "3.4.0",
"mocha": "2.3.4",
"phantomjs": "^1.9.19",
"phantomjs": "~2.1.3",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"sass-lint": "^1.5.0",