From: Kevin Ball <kmball11@gmail.com>
Date: Thu, 7 Apr 2016 04:00:01 +0000 (-0700)
Subject: Merge branch 'master' into develop
X-Git-Tag: v6.2.1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=352d597dc6f8ebbe7410ee3c2cac6470622454cb;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master' into develop
---

352d597dc6f8ebbe7410ee3c2cac6470622454cb
diff --cc package.json
index 12e625634,aa4af2aea..75d616eda
--- a/package.json
+++ b/package.json
@@@ -61,17 -53,12 +61,17 @@@
      "gulp-scss-lint": "^0.3.9",
      "gulp-sourcemaps": "^1.6.0",
      "gulp-uglify": "^1.1.0",
 -    "inquirer": "^0.11.2",
 +    "gulp-zip": "^3.2.0",
 +    "inquirer": "^0.11.4",
 +    "is-empty-object": "^1.1.1",
 +    "js-yaml": "^3.5.4",
      "mocha": "^2.3.3",
 +    "mocha-phantomjs": "^4.0.2",
      "motion-ui": "^1.1.0",
 -    "octophant": "^1.0.1",
 +    "multiline": "^1.0.2",
 +    "octophant": "^1.0.0",
      "opener": "^1.4.1",
-     "panini": "^1.1.1",
+     "panini": "^1.3.0",
      "parker": "0.0.9",
      "prettyjson": "^1.1.3",
      "require-dir": "^0.3.0",