Skip to content
Snippets Groups Projects
Commit 3a547501 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' into devel 

Conflicts:
	debian/changelog
	wiki/src/about.fr.po
parents 7ba60df5 0306fffd
Hide 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