]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commitdiff
projects / thirdparty / foundation / foundation-emails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56bfccf cdc1b08)
fixes mege conflict 483/head
authorRafiBomb <rafi@zurb.com>
Thu, 16 Jun 2016 18:41:17 +0000 (11:41 -0700)
committerRafiBomb <rafi@zurb.com>
Thu, 16 Jun 2016 18:41:17 +0000 (11:41 -0700)
1  2 
scss/grid/_grid.scss patch | diff1 | diff2 | blob | history
test/visual/pages/alignment.html patch | diff1 | diff2 | blob | history

diff --cc scss/grid/_grid.scss
Simple merge
diff --cc test/visual/pages/alignment.html
Simple merge
Mirror of https://github.com/foundation/foundation-emails.git