]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Sun, 15 Sep 2013 19:18:59 +0000 (21:18 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Sun, 15 Sep 2013 19:18:59 +0000 (21:18 +0200)
commitad82a56f79fa46fae0742d0647008025e32c3d2b
tree8b407c82b7e44761cfba105be1f10d17efcfaef7
parent4480b0b16409c9c2f3fcca34afbd5bd5d2d2a6e2
parent339c98e5e69103806f03d1eac660f69d1583c5c2
Merge branch 'master' into appframework-master
lib/base.php