summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/first_steps/upgrade.pt.po
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-01-10 14:09:14 +0000
committerTails developers <amnesia@boum.org>2014-01-10 14:09:14 +0000
commitae29aebb40781369c04c568224af0f9bcdb132bb (patch)
tree3af7a20aa95bae1275e022b49fba71542e0805e8 /wiki/src/doc/first_steps/upgrade.pt.po
parent26eeabf2d68f28b29ce8c82cc61a2a1ea49c6d0e (diff)
parentb20ac69530fe3ec869f25901730a09f71b7509bb (diff)
Merge remote-tracking branch 'origin/master' into stable0.22.1-rc1
Conflicts: wiki/src/doc/about/features.es.po
Diffstat (limited to 'wiki/src/doc/first_steps/upgrade.pt.po')
0 files changed, 0 insertions, 0 deletions