]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into lib-private-master-2
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 1 Oct 2013 14:11:59 +0000 (16:11 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 1 Oct 2013 14:11:59 +0000 (16:11 +0200)
commite2fe71b6e7d09477298cfdba3dd6a07695c26118
treea9bbcb7894d2902ed9965ddaf0e6ad7e893d7940
parent02d69762631edda67e56ff652c67dd12fef098fd
parentb66e492d6e79fc1bef1fc416ab06f751e0ede6d4
Merge branch 'master' into lib-private-master-2
lib/private/ocsclient.php
lib/private/updater.php
lib/private/util.php