]> 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: fbb0837 fbdd898)
Merge branch 'develop' into move-to-webpack
authorKevin Ball <kmball11@gmail.com>
Tue, 25 Apr 2017 16:20:08 +0000 (09:20 -0700)
committerKevin Ball <kmball11@gmail.com>
Tue, 25 Apr 2017 16:20:08 +0000 (09:20 -0700)

Trivial merge
Mirror of https://github.com/foundation/foundation-sites.git