Skip to content
Commit d59107e9 authored by David Metzler's avatar David Metzler
Browse files

Merge remote-tracking branch 'origin/7.x-4.x' into 7.x-4.x 

Conflicts:
	repos/reports/drupaladmin/enabled_contributions.frx
	repos/reports/drupaladmin/sample_active_users_letter.frx
parent 929ab50e
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