Skip to content
Commit e7eab290 authored by Simon Rycroft's avatar Simon Rycroft
Browse files

Merge branch '7.x-2.x' of git.drupal.org:project/slickgrid into 7.x-2.x 

Conflicts:
	slickgrid.install
parents 9ab0a23b 46e24635
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