Commit 1d4ca10b authored by Eric Morris's avatar Eric Morris
Browse files

Merge branch 'alert-css3-animation' of... 

Merge branch 'alert-css3-animation' of https://github.com/NikhilKalige/foundation into NikhilKalige-alert-css3-animation

Conflicts:
	js/foundation/foundation.alert.js
parents 5a8ba247 ceb6d9e5
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