]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into update-expire-function
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 25 Feb 2013 10:14:06 +0000 (11:14 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 25 Feb 2013 10:14:06 +0000 (11:14 +0100)
commit632ca9f06d2247061b7f03ce9bfcd0402bd92441
treebd8655da7d7b987c492f02b900bd04d2bc442324
parentdf76e0d1c33fc1fa9610b98a7aee41941c09eb3f
parent9ee5069f2a1d76c899eeef6cec0f06387764fabd
Merge branch 'master' into update-expire-function

Conflicts:
apps/files_trashbin/lib/trash.php
apps/files_trashbin/lib/trash.php
apps/files_versions/lib/versions.php