Skip to content
Commit cbfbbe67 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge commit 'refs/merge-requests/115' of... 

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

Conflicts:
	apps/files/templates/index.php
parents cf181e88 6f981738
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