Merge branch 'master' into dependabot/npm_and_yarn/babel-loader-7.1.5

network-api/networkapi/templates/pages/base.html

@@ -41,7 +41,7 @@
             <li class="col-auto"><a class="footer-link-email" href="mailto:network@mozillafoundation.org">Email</a></li>
             <li class="col-auto"><a class="footer-link-twitter" href="https://twitter.com/mozilla">Twitter</a></li>
             <li class="col-auto"><a class="footer-link-cc-license" href="https://creativecommons.org/licenses/by/4.0">License</a></li>
-            <li class="col-auto"><a class="footer-link-code-of-conduct" href="https://www.mozilla.org/about/governance/policies/participation/">Participation Guidelines</a></li>
+            <li class="col-auto"><a class="footer-link-participation-guidelines" href="https://www.mozilla.org/about/governance/policies/participation/">Participation Guidelines</a></li>
             <li class="col-auto"><a class="footer-link-legal" href="https://mozilla.org/en-US/about/legal/">Legal</a></li>
             <li class="col-auto"><a class="footer-link-privacy" href="https://mozilla.org/en-US/privacy/websites/">Privacy</a></li>
             <li class="col-auto"><a class="footer-link-donate" id="donate-footer-btn" href="https://donate.mozilla.org?utm_source=foundation.mozilla.org&amp;utm_medium=referral&amp;utm_content=footer" target="_blank" rel="noopener noreferrer">Donate</a></li>

package.json

@@ -52,19 +52,19 @@
     "html-entities": "^1.2.1",
     "imagemin-guetzli": "^1.0.0",
     "js-cookie": "2.2.0",
-    "mofo-bootstrap": "4.0.1",
+    "mofo-bootstrap": "4.1.0",
     "mofo-style": "^2.4.0",
     "moment": "^2.22.1",
     "node-sass": "^4.9.0",
     "npm-run-all": "^4.1.2",
     "optipng-bin": "^4.0.0",
     "postcss": "^6.0.22",
     "postcss-cli": "^4.1.1",
-    "prop-types": "^15.6.1",
+    "prop-types": "^15.6.2",
     "react": "16.0.0",
     "react-dom": "16.0.0",
-    "react-ga": "2.4.1",
-    "shelljs": "^0.7.8",
+    "react-ga": "2.5.3",
+    "shelljs": "^0.8.2",
     "shx": "^0.2.2",
     "snyk": "^1.78.1",
     "stylelint": "^8.4.0",