Skip to content
  • Tails developers's avatar
    Merge remote-tracking branch 'origin/master' into testing · 332e2d13
    Tails developers authored
    Conflicts:
    	wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.de.po
    	wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.es.po
    	wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fr.po
    	wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.pt.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.de.po
    	wiki/src/doc/first_steps/persistence/configure.es.po
    	wiki/src/doc/first_steps/persistence/configure.fr.po
    	wiki/src/doc/first_steps/persistence/configure.pt.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.mdwn
    	wiki/src/support/known_issues.pt.po
    332e2d13