]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix_glob_escaping
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 17 Jun 2013 12:51:08 +0000 (14:51 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 17 Jun 2013 12:51:08 +0000 (14:51 +0200)
commit99c62dfd768d17ba27078cd613058c676917f76f
treecef97bdb9a0cceac05ca2de42551a6b1295b92e0
parentefb026c664376c1091dfad59a506c076e69f0640
parent6156d71832ee031d8d1f50d8dbff7d0bcfb45541
Merge branch 'master' into fix_glob_escaping

Conflicts:
apps/files_trashbin/lib/trash.php
3rdparty
apps/files_trashbin/lib/trash.php