]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
projects / thirdparty / foundation / foundation-sites.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c58273a ddaa14a)
Merge remote-tracking branch 'foundation/develop' into patch-2 7515/head
authorBrett Mason <brettsmason@gmail.com>
Thu, 17 Dec 2015 08:10:10 +0000 (08:10 +0000)
committerBrett Mason <brettsmason@gmail.com>
Thu, 17 Dec 2015 08:10:10 +0000 (08:10 +0000)
commit9ac98665cd4618c4de6cdf1061ec0f41b7064862
treee0bfe31768faf5705f7820695a77202dac718c9atree
parentc58273ae929e532a8d89fa959dcac7a0b3b94a03commit | diff
parentddaa14a248a786273c76745377d237ad31e6eb8dcommit | diff
Merge remote-tracking branch 'foundation/develop' into patch-2

# Conflicts:
# scss/components/_dropdown-menu.scss
scss/components/_dropdown-menu.scss diff1 | diff2 | blob | history
Mirror of https://github.com/foundation/foundation-sites.git