]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge master into filesystem
authorRobin Appelman <icewind@owncloud.com>
Thu, 3 Jan 2013 14:59:17 +0000 (15:59 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 3 Jan 2013 14:59:17 +0000 (15:59 +0100)
1  2 
apps/files/ajax/upload.php
lib/util.php

Simple merge
diff --cc lib/util.php
Simple merge