commit 0b5305c93538d9aaba103bbdcf66b090eeb4d7a3
Author: hiro <[email protected]>
Date: Wed Mar 27 10:23:48 2019 +0100
Update htaccess
---
.htaccess | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.htaccess b/.htaccess
index bdf2262..218680a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -61,7 +61,11 @@ RewriteRule ^about/contact(.*) /contact$1 [R=301,L]
RewriteRule ^download/download/$ /download [R=301,L]
RewriteRule ^download/download.html(.*) /download [R=301,L]
RewriteRule ^download/easy-download(.*) /download [R=301,L]
+<<<<<<< HEAD
RewriteRule ^download/download-easy(.*) /download [R=302,L]
+=======
+RewriteRule ^download/download-easy(.*) /download [R=301,L]
+>>>>>>> Update htaccess
# Relays
RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays
[R=301,L]
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
