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

Merge branch 'master' into devel

Conflicts:
	wiki/src/contribute/release_process.mdwn
parents 49d4717d 7e2dbb5c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment