Skip to content
Commit d39a8c48 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

Merge branch 'upstream-3.1.x' into dfsg-upstream-3.1.x 

Conflicts:
	other-licenses/branding/thunderbird/thunderbird-branding.js
parents cd36d4b0 e44c95d5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment