]> source.dussan.org Git - nextcloud-server.git/commit
Merge master into trash_fileactions
authorRobin Appelman <icewind@owncloud.com>
Wed, 27 Feb 2013 19:29:19 +0000 (20:29 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 27 Feb 2013 19:29:19 +0000 (20:29 +0100)
commit429bf42e986c27a974571c474590840f304f7e08
treef257009f83cdad6860ad682e85cafa02c1f7eea6
parentf93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350
parent766a301a6b1832f98c30a09e0218a2e00925d401
Merge master into trash_fileactions
apps/files_trashbin/index.php
apps/files_trashbin/js/trash.js
apps/files_trashbin/lib/trash.php