]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabre-objecttree
authorRobin Appelman <icewind@owncloud.com>
Wed, 24 Jul 2013 13:53:48 +0000 (15:53 +0200)
committerRobin Appelman <icewind@owncloud.com>
Wed, 24 Jul 2013 13:53:48 +0000 (15:53 +0200)
1  2 
apps/files/appinfo/remote.php

Simple merge