Merge branch 'master' of gitorious.org:owncloud/owncloud

This commit is contained in:
Georg Ehrke 2012-02-13 17:07:24 +01:00
commit d10f4f071d
1 changed files with 3 additions and 1 deletions

View File

@ -3,7 +3,9 @@ ErrorDocument 404 /core/templates/404.php
php_value upload_max_filesize 512M php_value upload_max_filesize 512M
php_value post_max_size 512M php_value post_max_size 512M
php_value memory_limit 512M php_value memory_limit 512M
SetEnv htaccessWorking true <IfModule env_module>
SetEnv htaccessWorking true
</IfModule>
</IfModule> </IfModule>
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine on