]> 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: c1bfb05 89ecdce)
Merge branch 'develop' into v6.3
authorKevin Ball <kmball11@gmail.com>
Mon, 18 Apr 2016 23:03:04 +0000 (16:03 -0700)
committerKevin Ball <kmball11@gmail.com>
Mon, 18 Apr 2016 23:03:04 +0000 (16:03 -0700)
1  2 
scss/grid/_flex-grid.scss patch | diff1 | diff2 | blob | history
scss/settings/_settings.scss patch | diff1 | diff2 | blob | history

diff --cc scss/grid/_flex-grid.scss
Simple merge
diff --cc scss/settings/_settings.scss
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git