Skip to content
Commit 2222d923 authored by Roger Padilla's avatar Roger Padilla
Browse files

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

Conflicts:
	easy_breadcrumb.module
	includes/easy_breadcrumb.blocks.inc
parents cb535523 f8fadb58
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