From: Dylan Lloyd Date: Fri, 25 Mar 2011 03:37:39 +0000 (-0400) Subject: Merge branch 'dev' into live X-Git-Url: https://disinclined.org/git/?a=commitdiff_plain;h=8170ae8225a45092867ac0b0d6914282c02334a6;hp=ed22b7f1393fb7102beb9bbfad22864c2d4acb7a;p=dylansserver.git Merge branch 'dev' into live --- diff --git a/.htaccess b/.htaccess index d06e66b..fb00ba6 100644 --- a/.htaccess +++ b/.htaccess @@ -3,6 +3,8 @@ ErrorDocument 404 /404.php RewriteEngine on +RewriteRule ^git/?$ /git/gitweb.cgi%{REQUESTURI} [L] + RewriteRule ^captcha/?$ /index.php [L] RewriteRule ^note/([^/\.]+)?/?$ /index.php?note=$1 [L]