Commit 9164431f authored by Eric Morris's avatar Eric Morris
Browse files

Merge branch 'dropdown-hover-click' of https://github.com/Zmetser/foundation... 

Merge branch 'dropdown-hover-click' of https://github.com/Zmetser/foundation into Zmetser-dropdown-hover-click

Conflicts:
	js/foundation/foundation.dropdown.js
parents 05fce350 77a9ddf9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment