]> 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: c466819 6dd03e1)
Merge branch 'develop' into footer-update
authorRafiBomb <rafi@zurb.com>
Tue, 27 Jun 2017 19:20:55 +0000 (12:20 -0700)
committerRafiBomb <rafi@zurb.com>
Tue, 27 Jun 2017 19:20:55 +0000 (12:20 -0700)
1  2 
docs/assets/scss/docs.scss patch | diff1 | diff2 | blob | history
docs/layout/default.html patch | diff1 | diff2 | blob | history

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