Fix conflict

This commit is contained in:
/usr/bin/nano
2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions

View File

@@ -9,6 +9,6 @@ RewriteBase /
RewriteCond %{HTTPS} off
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
RewriteCond $1 !^(index\.php|script/merge\.php|script/*.|robots\.txt|favicon\.ico|sitemap\.xml|i/.*|tmp/.*|upl/.*|lib/ckeditor4/.*|cgi-bin/*.|wiki/*.|en/wiki/*.|google53bafd5cff611af3\.html|script/plugins/*.|awstats/*.|sandbox/*.)
RewriteCond $1 !^(index\.php|script/merge\.php|script/*.|robots\.txt|favicon\.ico|sitemap\.xml|i/.*|tmp/.*|upl/.*|lib/ckeditor4/.*|cgi-bin/*.|wiki/*.|en/wiki/*.|google53bafd5cff611af3\.html|script/plugins/*.|awstats/*.|blackout/*.|sandbox/*.)
RewriteRule ^(.*)$ /index.php?q=$1 [L,QSA]