Skip to content
Commit c74cb9dc authored by berenddeboer's avatar berenddeboer
Browse files

Merge tag '7.x-1.5-alpha4' into 7.x-1.x 

Conflicts:
	bible.module
parents e1a093a1 19fb5d4a
Expand all 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