]> source.dussan.org Git - nextcloud-server.git/commit
merge master into trash_fileactions
authorRobin Appelman <icewind@owncloud.com>
Thu, 7 Feb 2013 23:11:54 +0000 (00:11 +0100)
committerRobin Appelman <icewind@owncloud.com>
Thu, 7 Feb 2013 23:11:54 +0000 (00:11 +0100)
commitf93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350
treec76b2eabb63ed308eb882468cb2a74042e6f9d53
parent697536cf6ad1c9a862c32605b807172dfa680d22
parent3bd33b69a1c37cee5c3d180ec8952a611aabb4d1
merge master into trash_fileactions
apps/files_trashbin/js/trash.js
apps/files_trashbin/lib/trash.php