]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commit
Merge branch 'dropdown-hover-click' of https://github.com/Zmetser/foundation into...
authorEric Morris <elm232@cornell.edu>
Fri, 14 Mar 2014 07:32:25 +0000 (00:32 -0700)
committerEric Morris <elm232@cornell.edu>
Fri, 14 Mar 2014 07:32:25 +0000 (00:32 -0700)
commit9164431fc5725159f2c187cf190e572bdec01a01
treed28e1651ac3a7f1dba9b0b86c30aa587759880c9
parent05fce3508badb7418a95afc8b992237e7b7822e1
parent77a9ddf98a8d07673e0a862aa6fd25c42eb73f87
Merge branch 'dropdown-hover-click' of https://github.com/Zmetser/foundation into Zmetser-dropdown-hover-click

Conflicts:
js/foundation/foundation.dropdown.js
js/foundation/foundation.dropdown.js