Skip to content
Commit 698394c9 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods 

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
parents f2de5a34 9e4d1385
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