]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of github.com:owncloud/core into vcategories_db
authorThomas Tanghus <thomas@tanghus.net>
Mon, 5 Nov 2012 11:06:59 +0000 (12:06 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 5 Nov 2012 11:06:59 +0000 (12:06 +0100)
commit1147dc977422e827a201fa081abd07721231d072
tree203d47297c49545a67bbdd98cbe137b255a5d6d8
parent88b91a7304f2de998f71a674f4f62e85f5b83e54
parent135680e50bf760d55a1bcaaaa02f959bde396c52
Merge branch 'master' of github.com:owncloud/core into vcategories_db

Conflicts:
lib/vcategories.php
core/routes.php
lib/db.php
lib/vcategories.php