summaryrefslogtreecommitdiff
path: root/.htaccess
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-09-01 17:40:01 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-09-01 17:40:01 +0000
commit538df03dd14f93419209ef61107a674575828e25 (patch)
treef5874b59fa616d538abaf08f9c9bf61724788bba /.htaccess
parent940f9330efca76c84e7a645cafc93acd2751a225 (diff)
parent78c590ebaee738435260e3b0bf6cb8fb5431a08d (diff)
Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.
Diffstat (limited to '.htaccess')
-rw-r--r--.htaccess1
1 files changed, 1 insertions, 0 deletions
diff --git a/.htaccess b/.htaccess
index 88169bb6..38042737 100644
--- a/.htaccess
+++ b/.htaccess
@@ -66,4 +66,5 @@
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?kohana_uri=$1 [QSA,PT,L]
RewriteRule ^$ index.php?kohana_uri=$1 [QSA,PT,L]
+ RewriteRule ^index.php/(.*) $1 [QSA,R,L]
</IfModule>