]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of https://github.com/owncloud/core
authorHenrik Kjölhede <hkjolhede@gmail.com>
Sat, 9 Feb 2013 13:05:33 +0000 (14:05 +0100)
committerHenrik Kjölhede <hkjolhede@gmail.com>
Sat, 9 Feb 2013 13:05:33 +0000 (14:05 +0100)
commit41fa65e7befb249e260f2dd91e33971261cfd302
tree4ebb4cb10f7869ba3288308ca3a35ce53970ed40
parentb1b2eafa50db54b2613cf2bc52bfab2015d67b2f
parentec829bd345045df985f623fa2fe6587d0ce68eb2
Merge branch 'master' of https://github.com/owncloud/core

Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
lib/files/storage/common.php