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

Merge tag '6.36' into 6.x 

6.36 release

Conflicts:
	CHANGELOG.txt
	modules/system/system.module
parents 89f56c3b a362d912
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