]> 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: 3c5f72f 61e94d3)
Merge branch 'issue-7904' of https://github.com/sethkane/foundation-sites into issue...
authorsethk <sethk@criticalmass.com>
Thu, 14 Apr 2016 14:50:46 +0000 (08:50 -0600)
committersethk <sethk@criticalmass.com>
Thu, 14 Apr 2016 14:50:46 +0000 (08:50 -0600)
# Conflicts:
# js/foundation.reveal.js


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