Skip to content
Commit 5953ae2c authored by Cody Craven's avatar Cody Craven
Browse files

Merge branch '7.x-1.x' of git.drupal.org:project/taxonomy_display into 7.x-1.x 

Conflicts:
	CHANGELOG.txt
parents dcb5e1ed 6e094d85
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