Skip to content
Commit 02dc89ea authored by Rob Loach's avatar Rob Loach
Browse files

Merge branch 'jquery-migrate' into 7.x-3.x 

Conflicts:
	jquery_update.module
parents e1a1d0b4 46054426
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment