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

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

Conflicts:
	wiki/src/contribute/release_process/test.mdwn
	wiki/src/doc/about/openpgp_keys.fr.po
parents b6c8b7a9 08b5eaf3
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