Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-01-18 19:15:48 -06:00
parent 702388461a 73094f2633
commit 437ea54681
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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

8
public/.htaccess
View File

@ -1,14 +1,14 @@
<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]