Merge remote-tracking branch 'origin/devel' into feature/10658-clean-up-path

a7db4fa6 · anonym · c85cef39 · cb2ef045 · a7db4fa6 · a7db4fa6
Commit a7db4fa6 authored Jan 03, 2016 by anonym
--- a/wiki/src/torrents/files/tails-i386-2.0~beta1.iso.sig
+++ b/wiki/src/torrents/files/tails-i386-2.0~beta1.iso.sig
--- a/wiki/src/upgrade.de.po
+++ b/wiki/src/upgrade.de.po
--- a/wiki/src/upgrade.fa.po
+++ b/wiki/src/upgrade.fa.po
--- a/wiki/src/upgrade.fr.po
+++ b/wiki/src/upgrade.fr.po
--- a/wiki/src/upgrade.html
+++ b/wiki/src/upgrade.html
--- a/wiki/src/upgrade.pt.po
+++ b/wiki/src/upgrade.pt.po
--- a/wiki/src/upgrade/clone.fa.po
+++ b/wiki/src/upgrade/clone.fa.po
--- a/wiki/src/upgrade/clone/overview.fa.po
+++ b/wiki/src/upgrade/clone/overview.fa.po
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.po
--- a/wiki/src/upgrade/tails.fa.po
+++ b/wiki/src/upgrade/tails.fa.po
--- a/wiki/src/upgrade/tails.fr.po
+++ b/wiki/src/upgrade/tails.fr.po
--- a/wiki/src/upgrade/tails.mdwn
+++ b/wiki/src/upgrade/tails.mdwn
--- a/wiki/src/upgrade/tails.pt.po
+++ b/wiki/src/upgrade/tails.pt.po
--- a/wiki/src/upgrade/tails/overview.fa.po
+++ b/wiki/src/upgrade/tails/overview.fa.po
--- a/wiki/src/wishlist.fa.po
+++ b/wiki/src/wishlist.fa.po