Skip to content
Snippets Groups Projects
Commit 5550cde0 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

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

Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
parents d9d8da0a 3fdf239b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 4660 deletions
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