• Tails developers's avatar
    Merge branch 'master' into testing · 09e5840e
    Tails developers authored
    Conflicts:
    	wiki/src/about.de.po
    	wiki/src/doc/about/requirements.fr.po
    	wiki/src/doc/first_steps/persistence/configure.fr.po
    	wiki/src/doc/first_steps/usb_installation.fr.po
    09e5840e
ikiwiki-cgi.setup 12.6 KB