Skip to content
Snippets Groups Projects
Commit d10f4f07 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

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

parents 40d343e2 d9db6e73
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
.htaccess
+ 3
− 1
View file @ d10f4f07
...@@ -3,7 +3,9 @@ ErrorDocument 404 /core/templates/404.php ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment