]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
authorBart Visscher <bartv@thisnet.nl>
Wed, 28 Aug 2013 13:12:58 +0000 (06:12 -0700)
committerBart Visscher <bartv@thisnet.nl>
Wed, 28 Aug 2013 13:12:58 +0000 (06:12 -0700)
Clean 3rdparty mess master

1  2 
apps/files_external/lib/smb.php

Simple merge