]> git.ipfire.org Git - thirdparty/foundation/foundation-emails.git/commit
fix merge conflicts
authorRafiBomb <rafi@zurb.com>
Mon, 7 Mar 2016 18:51:20 +0000 (10:51 -0800)
committerRafiBomb <rafi@zurb.com>
Mon, 7 Mar 2016 18:51:20 +0000 (10:51 -0800)
commit2ee68bd91e16491837c4653218a6d7a9aaa8a90f
tree080476e7ad0b0a5ec4e606e5534eb3a49b3162fd
parentbe5fb7b6dbc05400593437350413e14c6d8463f5
parent16915b6c6bbfdff7f06d771484fb9c648a3a4907
fix merge conflicts
scss/grid/_grid.scss
testing/src/assets/scss/_settings.scss