]> source.dussan.org Git - nextcloud-server.git/commit
Merge master into oc_preview
authorGeorg Ehrke <developer@georgehrke.com>
Thu, 29 Aug 2013 08:50:55 +0000 (10:50 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Thu, 29 Aug 2013 08:50:55 +0000 (10:50 +0200)
commitb7758d0f8d52b2f9653cfee549558327c00c8e01
tree309fb713ed25f35f746c59c668521bf9023bc331
parent70b6e2161ec654f7049027bf6dc5072c1eda4d5e
parentea6e74ca9546ca95b3a6372c6106cd8ab2ea2ee9
Merge master into oc_preview
3rdparty
apps/files/css/files.css
apps/files/index.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/templates/part.list.php
apps/files_trashbin/lib/trash.php
config/config.sample.php
core/css/styles.css
lib/base.php
lib/helper.php