]> 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: 7e6ad19 3017548)
fixed conflict
authorzurbchris <chris@zurb.com>
Thu, 28 Feb 2013 19:33:16 +0000 (11:33 -0800)
committerzurbchris <chris@zurb.com>
Thu, 28 Feb 2013 19:33:16 +0000 (11:33 -0800)
1  2 
docs/index.html.erb patch | diff1 | diff2 | blob | history

diff --cc docs/index.html.erb
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git