Merge branch 'master' into dashboard_loading_refactoring
Showing
... | ... | @@ -4,7 +4,7 @@ |
"company": "Coding Instinct AB" | ||
}, | ||
"name": "grafana", | ||
"version": "1.6.0-rc.1", | ||
"version": "1.6.0", | ||
"repository": { | ||
"type": "git", | ||
"url": "http://github.com/torkelo/grafana.git" | ||
... | ... | @@ -32,17 +32,17 @@ |
"expect.js": "~0.2.0", | ||
"karma-script-launcher": "~0.1.0", | ||
"karma-firefox-launcher": "~0.1.3", | ||
"karma-chrome-launcher": "~0.1.2", | ||
"karma-chrome-launcher": "~0.1.4", | ||
"karma-html2js-preprocessor": "~0.1.0", | ||
"karma-jasmine": "~0.1.5", | ||
"karma-jasmine": "~0.2.2", | ||
"requirejs": "~2.1.9", | ||
"karma-requirejs": "~0.2.1", | ||
"karma-coffee-preprocessor": "~0.1.2", | ||
"karma-phantomjs-launcher": "~0.1.1", | ||
"karma": "~0.10.9", | ||
"grunt-karma": "~0.6.2", | ||
"karma-mocha": "~0.1.1", | ||
"karma-expect": "~1.0.0", | ||
"karma": "~0.12.16", | ||
"grunt-karma": "~0.8.3", | ||
"karma-mocha": "~0.1.4", | ||
"karma-expect": "~1.1.0", | ||
"grunt-cli": "~0.1.13", | ||
"jshint-stylish": "~0.1.5", | ||
"grunt-contrib-concat": "^0.4.0", | ||
... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment