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

Merge branch 'stable' of git://git.tails.boum.org/tails into stable 

Conflicts:
	wiki/src/press.mdwn
parents f6f08008 4d85dd29
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