| commit | cc2db04c154eb893a28e3b988322a80e2e0e9b0a | |
| author | Tails developers <tails@boum.org> | |
| Sun, 13 Jul 2014 13:43:54 +0000 (13 15:43 +0200) | ||
| committer | Tails developers <tails@boum.org> | |
| Sun, 13 Jul 2014 13:43:54 +0000 (13 15:43 +0200) | ||
| tree | c91bcb5d86bf30d547e418804492ac26dbef5f44 | treesnapshot (tar.gz zip) |
| parent | 5560e208971b12c9959d6cc9b6ef6345d0175dab | commitdiff |
| parent | dbee95fbd2e3d1bf04102c5312f7e2a8ccc5316c | commitdiff |
merge conflicts
| wiki/src/support/known_issues.fr.po | diff1 | diff2 | blobhistory |