| commit | b736ac5da8c0f9f2758f9937ebf3242e7a3bd0d0 | |
| author | Tails developers <amnesia@boum.org> | |
| Sun, 10 Nov 2013 13:01:20 +0000 (10 13:01 +0000) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Sun, 10 Nov 2013 13:01:20 +0000 (10 13:01 +0000) | ||
| tree | 741a86633a91874a8a93832c2335a790d16a1c18 | treesnapshot (tar.gz zip) |
| parent | caf73e354d8f551b887fd3f02eabe5147f789456 | commitdiff |
| parent | 4d0f5cccc26a2e5f7bb4e892d2f70bbcce86fbdd | commitdiff |
Merge branch 'master' of git://git.tails.boum.org/mercedes508/tails
Conflicts:
wiki/src/contribute.fr.po
Conflicts:
wiki/src/contribute.fr.po