Merge branch 'hotfix/3.1.1'

contao · Jun 25, 2013 · 3d32610 · 3d32610
2 parents 24e0357 + 7ba425a
commit 3d32610
Show file tree

Hide file tree

Showing 317 changed files with 34,779 additions and 340 deletions.
diff --git a/.htaccess.default b/.htaccess.default
@@ -229,7 +229,7 @@ FileETag None
   ##
   #AddEncoding gzip .gz
   #<FilesMatch "\.js\.gz$">
-  #  AddType "text/javascript" .gz
+  #  AddType "application/javascript" .gz
   #</FilesMatch>
   #<FilesMatch "\.css\.gz$">
   #  AddType "text/css" .gz