]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into lib-private-master-2
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 19:29:58 +0000 (21:29 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 19:29:58 +0000 (21:29 +0200)
commit02d69762631edda67e56ff652c67dd12fef098fd
treec1bfbe928de9f50f67b88bbd42f23f0fb228f635
parent8e0060405dd585a33f58d6a5520532726b3af5d6
parentb58a464b864e70076aa0bde6d70c727b2aa32397
Merge branch 'master' into lib-private-master-2
lib/base.php
lib/private/util.php