| commit | 47ff7e956ed1d88dca4e04b821212cf1ea2a0bbc | |
| author | Tails developers <amnesia@boum.org> | |
| Thu, 24 Jul 2014 12:50:00 +0000 (24 12:50 +0000) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Thu, 24 Jul 2014 12:50:00 +0000 (24 12:50 +0000) | ||
| tree | b7651ab34a0f27f58ad9bba1a77b50c44e5d66a3 | treesnapshot (tar.gz zip) |
| parent | a32dbed7cf04e87a1c41cd20f000ae9b63e6afc0 | commitdiff |
| parent | 720a95e788c0766f76ebc3f04777a4390abb296d | commitdiff |
Merge branch 'master' of git://git.tails.boum.org/tails
Conflicts:
wiki/src/press.mdwn
Conflicts:
wiki/src/press.mdwn
| wiki/src/support/known_issues.mdwn | diff1 | diff2 | blobhistory |