Skip to content
Snippets Groups Projects
Commit a73fbc5e authored by Robin Appelman's avatar Robin Appelman
Browse files

Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge 

Conflicts:
	inc/HTTP/WebDAV/Server/Filesystem.php
	inc/lib_config.php
	inc/lib_log.php
	inc/lib_user.php
	inc/templates/adminform.php
parents 845d5341 76672fe0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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