]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorSam Tuke <samtuke@owncloud.com>
Tue, 3 Jul 2012 17:17:32 +0000 (18:17 +0100)
committerSam Tuke <samtuke@owncloud.com>
Tue, 3 Jul 2012 17:17:32 +0000 (18:17 +0100)
commitb1c9785eb3fec9bc12dab8e4984b0b45880e7fa6
tree5467788a76be25b2a26ed5a75d2e1058573737d6
parenta775deaf22ee803ae2ff0dbe1068229d9c819232
parentaec6eea235526644be4e0642dd59a3b5f8e9c0e3
Merge branch 'master' of gitorious.org:owncloud/owncloud

Conflicts:
apps/files_versions/lib/versions.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/lib/versions.php