Skip to content
Commit 96e88158 authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/master' into devel 

Conflicts:
	wiki/src/doc/about/warning.pt.po
parents 789ac14c 3a650c46
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