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

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

Conflicts:
	wiki/src/doc/first_steps.index.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
	wiki/src/doc/first_steps/persistence/configure.de.po
	wiki/src/doc/first_steps/persistence/configure.es.po
	wiki/src/doc/first_steps/persistence/configure.pt.po
	wiki/src/doc/first_steps/usb_installation.de.po
	wiki/src/doc/first_steps/usb_installation.es.po
	wiki/src/doc/first_steps/usb_installation.fr.po
	wiki/src/doc/first_steps/usb_installation.pt.po
	wiki/src/doc/first_steps/usb_upgrade.de.po
	wiki/src/doc/first_steps/usb_upgrade.es.po
	wiki/src/doc/first_steps/usb_upgrade.fr.po
	wiki/src/doc/first_steps/usb_upgrade.pt.po
parents 41af2984 0bd8b948
No related branches found
No related tags found
No related merge requests found
Showing
with 1843 additions and 795 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment