modif : htaccess
This commit is contained in:
parent
c05c55fae7
commit
6a74a90119
15
.htaccess
15
.htaccess
|
@ -5,18 +5,3 @@ SetEnv SESSION_USE_TRANS_SID 0
|
|||
Options -Indexes
|
||||
|
||||
# Attention, surtout ne rien modifier ci-dessous !
|
||||
<<<<<<< HEAD
|
||||
# URL rewriting
|
||||
<<<<<<< HEAD
|
||||
<ifModule mod_rewrite.c>
|
||||
RewriteEngine on
|
||||
RewriteBase /ZwiiCMS-dev/
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteRule ^(.*)$ index.php?$1 [L]
|
||||
</ifModule>
|
||||
=======
|
||||
# URL rewriting
|
||||
>>>>>>> 8.3.13
|
||||
=======
|
||||
>>>>>>> 01bb746d85945fc264fe7ce1db51c8716ab97b49
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue