• sajolida's avatar
    Merge remote-tracking branch 'origin/master' into web/9323-replace-old-documentation · 259e6870
    sajolida authored
    Conflicts:
    	wiki/src/doc.pt.po
    	wiki/src/doc/about/license.fr.po
    	wiki/src/doc/about/openpgp_keys.de.po
    	wiki/src/doc/about/openpgp_keys.fa.po
    	wiki/src/doc/about/openpgp_keys.fr.po
    	wiki/src/doc/about/openpgp_keys.pt.po
    	wiki/src/doc/first_steps.index.fr.po
    	wiki/src/doc/first_steps.index.pt.po
    	wiki/src/install/inc/steps/bittorrent_verification.inline.fr.po
    	wiki/src/install/inc/steps/bittorrent_verification.inline.pt.po
    	wiki/src/install/inc/steps/create_persistence.inline.fr.po
    	wiki/src/install/inc/steps/create_persistence.inline.pt.po
    	wiki/src/install/inc/steps/download.inline.html
    	wiki/src/install/inc/steps/download.inline.pt.po
    	wiki/src/install/inc/steps/install_final.inline.pt.po
    	wiki/src/install/inc/steps/install_intermediary_intro.inline.pt.po
    	wiki/src/install/inc/steps/install_tails_installer.inline.de.po
    	wiki/src/install/inc/steps/install_tails_installer.inline.fa.po
    	wiki/src/install/inc/steps/install_tails_installer.inline.fr.po
    	wiki/src/install/inc/steps/install_tails_installer.inline.pt.po
    	wiki/src/install/inc/steps/mac_startup_disks.inline.pt.po
    	wiki/src/install/inc/steps/verify_up-to-date.inline.pt.po
    	wiki/src/support.pt.po
    259e6870
report_2016_03.mdwn 7.77 KB