]> 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 13:26:59 +0000 (14:26 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 25 Feb 2013 13:26:59 +0000 (14:26 +0100)
commit4c980a4851804c4f5379e364e106edacd04c42e4
tree0ad2d8efe8affc59cdeeb65edfec05e45a07c8db
parent632ca9f06d2247061b7f03ce9bfcd0402bd92441
parenta37577e007ef458e31d3484b5f969ea0e98545f3
Merge branch 'master' into update-expire-function

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