]> 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: 31a1996 a158ad1)
Merge branch 'master' into develop
authorKevin Ball <kmball11@gmail.com>
Wed, 4 Oct 2017 15:31:48 +0000 (08:31 -0700)
committerKevin Ball <kmball11@gmail.com>
Wed, 4 Oct 2017 15:31:48 +0000 (08:31 -0700)
1  2 
docs/assets/scss/docs.scss patch | diff1 | diff2 | blob | history
package.json patch | diff1 | diff2 | blob | history

diff --cc docs/assets/scss/docs.scss
Simple merge
diff --cc package.json
Simple merge
Mirror of https://github.com/foundation/foundation-sites.git