Skip to content
Commit 11cc2b02 authored by David Rothstein's avatar David Rothstein
Browse files

Merge tag '7.38' into 7.x 

7.38 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
parents dc84091a 5cb79b4b
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