remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS-dev

Browse Source
This commit is contained in:
fredtempez 2018-09-09 11:48:11 +02:00
commit 44397ffab7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess
View File

@ -7,6 +7,7 @@ Options -Indexes
# Attention, surtout ne rien modifier ci-dessous ! # Attention, surtout ne rien modifier ci-dessous !
<<<<<<< HEAD <<<<<<< HEAD
# URL rewriting # URL rewriting
<<<<<<< HEAD
<ifModule mod_rewrite.c> <ifModule mod_rewrite.c>
RewriteEngine on RewriteEngine on
RewriteBase /ZwiiCMS-dev/ RewriteBase /ZwiiCMS-dev/
@ -17,3 +18,5 @@ Options -Indexes
======= =======
# URL rewriting # URL rewriting
>>>>>>> 8.3.13 >>>>>>> 8.3.13
=======
>>>>>>> 01bb746d85945fc264fe7ce1db51c8716ab97b49