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

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

Conflicts:
	wiki/src/doc/about/features.es.po
parents 26eeabf2 b20ac695
Branches
Tags 0.22.1-rc1
No related merge requests found
Showing
with 0 additions and 2988 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment