]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74bd5aa 2b1a450)
Merge branch 'develop' into support/6.4
authorKevin Ball <kmball11@gmail.com>
Wed, 2 Aug 2017 12:58:49 +0000 (05:58 -0700)
committerKevin Ball <kmball11@gmail.com>
Wed, 2 Aug 2017 12:58:49 +0000 (05:58 -0700)
1  2 
docs/pages/installation.md patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history
scss/foundation.scss patch | diff1 | diff2 | blob | history

diff --cc docs/pages/installation.md
Simple merge
diff --cc package.json
Simple merge
diff --cc scss/foundation.scss
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git