Skip to content
Commit 1147dc97 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

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

Conflicts:
	lib/vcategories.php
parents 88b91a73 135680e5
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