]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
projects / thirdparty / foundation / foundation-sites.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ddf3b65) | patch
fixed merge conflict 4469/head
authorShawn Erquhart <shawn@professant.com>
Mon, 17 Feb 2014 22:12:50 +0000 (17:12 -0500)
committerShawn Erquhart <shawn@professant.com>
Mon, 17 Feb 2014 22:12:50 +0000 (17:12 -0500)
commit2eaee018e6a5a7b313b66b78f915955fd7b7db0a
treebbf19a9833f92347f79e67daf5ac4fe42f84a1e4tree
parentddf3b65f26f4bc95b1be224acbcbb7d60ab0091bcommit | diff
fixed merge conflict
scss/foundation/components/_buttons.scss diff | blob | blame | history
Mirror of https://github.com/foundation/foundation-sites.git