From: Thomas Tanghus Date: Fri, 4 Oct 2013 18:03:31 +0000 (+0200) Subject: Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories... X-Git-Tag: v6.0.0alpha2~35^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c230f8c85cf80efb10093e66e1197c200c185c1;p=nextcloud-server.git Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories_to_tags --- 9c230f8c85cf80efb10093e66e1197c200c185c1