commit 1621e47c3ca92690ebd753bb0a8be923c83a92f2 Merge: 8c03c24 6572a52 Author: Sebastian Hahn sebastian@torproject.org Date: Fri Jul 24 03:11:00 2015 +0200
Merge branch 'master' into staging
about/en/sponsors.wml | 1 + en/index.wml | 9 +++++++++ getinvolved/en/tshirt.wml | 40 ++++++++++++++++++++++++++-------------- images/torshirtsob.jpg | Bin 0 -> 34488 bytes 4 files changed, 36 insertions(+), 14 deletions(-)