]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into versioning_preview_shared
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 11 Oct 2013 15:00:21 +0000 (17:00 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Fri, 11 Oct 2013 15:00:21 +0000 (17:00 +0200)
1  2 
apps/files_versions/lib/versions.php

Simple merge