]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into chore/compability-update-browserslist-9123 11021/head
authorNicolas Coden <nicolas@ncoden.fr>
Sun, 22 Apr 2018 21:35:57 +0000 (23:35 +0200)
committerGitHub <noreply@github.com>
Sun, 22 Apr 2018 21:35:57 +0000 (23:35 +0200)
1  2 
docs/assets/img/gulpfile.js
docs/pages/compatibility.md
docs/pages/sass.md
gulp/config.js
gulp/tasks/customizer.js

Simple merge
index aa4a7a9ea7e834eb58f3d3005aaf4b43aee998fa,204b83920e27d5758c44cea8352cfdba1b4bf3ea..f9223db08e9ffb509082cd00c20ead4be3c1cab7
@@@ -16,8 -16,9 +16,9 @@@ tags
    <tr><td>Firefox</td></tr>
    <tr><td>Safari</td></tr>
    <tr><td>Opera</td></tr>
 -  <tr><td>Mobile Safari</td></tr>
 +  <tr><td>Mobile Safari<sup>1</sup></td></tr>
    <tr><td>IE Mobile</td></tr>
+   <tr><td>Edge</td></tr>
    <tr>
      <td>Internet Explorer</td>
      <td class="works">Versions 9+</td>
Simple merge
diff --cc gulp/config.js
Simple merge
Simple merge