]> 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: 9407fea 70c7b3a)
Merge branch 'develop' into kball-grid-experiments 10017/head
authorKevin Ball <kmball11@gmail.com>
Thu, 1 Jun 2017 17:05:40 +0000 (10:05 -0700)
committerKevin Ball <kmball11@gmail.com>
Thu, 1 Jun 2017 17:05:40 +0000 (10:05 -0700)
1  2 
docs/assets/scss/docs.scss patch | diff1 | diff2 | blob | history
docs/partials/component-list.html patch | diff1 | diff2 | blob | history

diff --cc docs/assets/scss/docs.scss
Simple merge
diff --cc docs/partials/component-list.html
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git