Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Dec 20, 2013
2 parents 81b53b7 + 5e7a1da commit 05924e6
Show file tree
Hide file tree
Showing 100 changed files with 798 additions and 465 deletions.
10 changes: 7 additions & 3 deletions .htaccess.default
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ FileETag None
# Note: If you are using a case-sensitive file system like HFS+ or ext4, you
# have to change the <FilesMatch> directive as follows:
#
# <FilesMatch "\.(?i:js|css|xml|gz)$">
# <FilesMatch "\.(?i:js|css|xml|gz|svgz)$">
#
# For more information see: https://github.com/contao/core/issues/4364
##
Expand Down Expand Up @@ -246,7 +246,11 @@ FileETag None
# Note: If you are using a case-sensitive file system like HFS+ or ext4, you
# have to change the <FilesMatch> directive as follows:
#
# <FilesMatch "\.(?i:htm|php|js|css| … |gz)$">
# <FilesMatch "\.(?i:htm|php|js|css|…|gz)$">
#
# Note: The directive will disable mod_rewrite entirely for the configured
# file types, so if you want to apply custom rules such as domain redirects,
# make sure to comment the lines (see #6588).
#
# For more information see: https://github.com/contao/core/issues/4364
##
Expand Down Expand Up @@ -281,7 +285,7 @@ FileETag None

##
# The following rules are required if you want to pass the language as first
# URL parameter (added in Contao 2.11). The first rule rewrites an empty URL
# URL parameter (added in Contao 2.11). The first rule rewrites the empty URL
# to the front end controller, the second one adds a missing trailing slash.
##
RewriteRule ^[a-z]{2}(\-[A-Z]{2})?/$ index.php [L]
Expand Down
Loading

0 comments on commit 05924e6

Please sign in to comment.