Skip to content
GitLab
Explore
Sign in
Commit
96e88158
authored
May 29, 2014
by
Tails developers
Browse files
Merge remote-tracking branch 'origin/master' into devel
Conflicts: wiki/src/doc/about/warning.pt.po
parents
789ac14c
3a650c46
Loading
Loading
Loading
Changes
7
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment