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 develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-11-09 11:25:22 +01:00
parent e51d403420 88d27fe649
commit b25b31e4a0
25 changed files with 509 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/options/phantomjs.js
View File

@@ -6,6 +6,11 @@ module.exports = function(config,grunt) {
var dest = './vendor/phantomjs/phantomjs';
var confDir = './node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/'
if (!grunt.file.exists(confDir)) {
// npm 3 or npm 2 with dedupe
confDir = './node_modules/phantomjs/lib/';
}
if (!grunt.file.exists(dest)){
var m=grunt.file.read(confDir+"location.js")