Merge branch 'master' of github.com:elastic/kibana into update/lodash

This commit is contained in:
Spencer Alger 2015-06-17 08:02:27 -07:00
commit 410679d661
2 changed files with 4 additions and 4 deletions

View file

@ -32,15 +32,15 @@
"elasticsearch": "~5.0.0",
"Faker": "1.1.0",
"FileSaver": "babc6d9d8f",
"font-awesome": "4.2.0",
"font-awesome": "4.3.0",
"gridster": "0.5.6",
"jquery": "2.1.4",
"leaflet": "0.7.3",
"Leaflet.heat": "Leaflet/Leaflet.heat#627ede7c11bbe43",
"lesshat": "3.0.2",
"lodash": "3.9.3",
"moment": "2.9.0",
"moment-timezone": "0.0.6",
"moment": "2.10.3",
"moment-timezone": "0.4.0",
"ng-clip": "0.2.6",
"require-css": "0.1.8",
"requirejs": "2.1.18",

View file

@ -64,7 +64,7 @@
"numeral": "^1.5.3",
"request": "^2.40.0",
"requirefrom": "^0.2.0",
"semver": "^4.2.0",
"semver": "^4.3.6",
"serve-favicon": "^2.2.0",
"through": "^2.3.6"
},