Skip to content
Commit 3870a442 authored by Bryan Selders's avatar Bryan Selders
Browse files

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

Conflicts:
	js/logo_watermark.js
parents af984983 6cecdde9
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