]> 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: b89b60e 5606925)
Merge branch 'master' into develop
authorGeoff Kimball <geoff@zurb.com>
Wed, 20 Jan 2016 21:58:00 +0000 (13:58 -0800)
committerGeoff Kimball <geoff@zurb.com>
Wed, 20 Jan 2016 21:58:00 +0000 (13:58 -0800)
1  2 
docs/pages/flex-grid.md patch | diff1 | diff2 | blob | history
docs/pages/responsive-navigation.md patch | diff1 | diff2 | blob | history
docs/pages/reveal.md patch | diff1 | diff2 | blob | history

diff --cc docs/pages/flex-grid.md
Simple merge
diff --cc docs/pages/responsive-navigation.md
Simple merge
diff --cc docs/pages/reveal.md
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git