| commit | e1f8866c6920db990be02f528232e61f62068895 | |
| author | Tails developers <amnesia@boum.org> | |
| Mon, 29 Sep 2014 12:26:48 +0000 (29 14:26 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Mon, 29 Sep 2014 12:26:48 +0000 (29 14:26 +0200) | ||
| tree | 0dddd9185c34d9053b4c091ff649cb4357f72044 | treesnapshot (tar.gz zip) |
| parent | 3af48c8d80deb0ca8eb716815d9f05be11e31ebd | commitdiff |
| parent | 6a3681e04d532a0554f7b4e947168d599875c8d2 | commitdiff |
Merge remote-tracking branch 'origin/feature/6579-disable-tcp-timestamps' into devel
Conflicts:
wiki/src/contribute/design.mdwn
Conflicts:
wiki/src/contribute/design.mdwn
| wiki/src/contribute/design.mdwn | diff1 | diff2 | blobhistory |