From: Nicolas Coden <nicolas@ncoden.fr>
Date: Mon, 30 Apr 2018 08:20:48 +0000 (+0200)
Subject: Merge branch 'develop' into chore/commit-messages-linting
X-Git-Tag: v6.6.0~3^2~216^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11197%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into chore/commit-messages-linting
---

2b8841d0fa55a622a0715bf0bfdb9a3377d0a692
diff --cc yarn.lock
index 450b940f4,a4d9eb192..301ba0e23
--- a/yarn.lock
+++ b/yarn.lock
@@@ -3541,10 -3327,10 +3566,14 @@@ get-caller-file@^1.0.1
    version "1.0.2"
    resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
  
+ get-func-name@^2.0.0:
+   version "2.0.0"
+   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+ 
 +get-stdin@5.0.1:
 +  version "5.0.1"
 +  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
 +
  get-stdin@^4.0.1:
    version "4.0.1"
    resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@@ -6780,12 -6456,10 +6809,16 @@@ path-type@^2.0.0
    dependencies:
      pify "^2.0.0"
  
 +path-type@^3.0.0:
 +  version "3.0.0"
 +  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
 +  dependencies:
 +    pify "^3.0.0"
 +
+ pathval@^1.0.0:
+   version "1.1.0"
+   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+ 
  pause-stream@0.0.11:
    version "0.0.11"
    resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"