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

Merge branch 'devel' into feature/sdio

Conflicts:
	wiki/src/bugs/ThinkPad_X220_vs_GPT.mdwn
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
	wiki/src/doc/first_steps/persistence/configure.fr.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.es.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po
parents d706f76e 623c7d2c
No related branches found
No related tags found
No related merge requests found
Showing
with 145 additions and 274 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