Commit 437ea546 authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' into develop

parents 70238846 73094f26
...@@ -2,5 +2,7 @@ ...@@ -2,5 +2,7 @@
/vendor /vendor
composer.phar composer.phar
composer.lock composer.lock
.env.local.php
.env.php
.DS_Store .DS_Store
Thumbs.db Thumbs.db
\ No newline at end of file
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
<IfModule mod_negotiation.c> <IfModule mod_negotiation.c>
Options -MultiViews Options -MultiViews
</IfModule> </IfModule>
RewriteEngine On RewriteEngine On
# Redirect Trailing Slashes... # Redirect Trailing Slashes...
RewriteRule ^(.*)/$ /$1 [L,R=301] RewriteRule ^(.*)/$ /$1 [L,R=301]
# Handle Front Controller... # Handle Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L] RewriteRule ^ index.php [L]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment