[tor-commits] [tpo/staging] Merge pull request #13 from torproject/master

[emmapeel@xxxxxxxxxxxxxx]

commit 32863000150d73d1bf195f1952c013d1c3fe4195
Merge: 7918445 2f1e281
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Wed Mar 27 14:05:24 2019 -0300

    Merge pull request #13 from torproject/master
    
    rebase

 .htaccess                       | 13 ++++++++++++-
 templates/download-android.html |  2 +-
 templates/macros/people.html    |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits