| commit | 7c28c2a45002be79b7160680a1142541664f3c8b | |
| author | Tails developers <amnesia@boum.org> | |
| Sun, 21 Sep 2014 16:34:56 +0000 (21 18:34 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Sun, 21 Sep 2014 16:34:56 +0000 (21 18:34 +0200) | ||
| tree | 2539436ecc95ecbc87104f938a79178ff9f5275c | treesnapshot (tar.gz zip) |
| parent | 2219342f2d367c6a2c53f36f1b179e7dbb0332b3 | commitdiff |
| parent | d25e2f0c62ab092ea176168f44919fe63baf6b17 | commitdiff |
Merge branch 'web/promoting_and_teaching'