]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'appframework-master' into public_cache
authorThomas Tanghus <thomas@tanghus.net>
Wed, 18 Sep 2013 11:20:07 +0000 (13:20 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Wed, 18 Sep 2013 11:20:07 +0000 (13:20 +0200)
commitdd62ccdb4eb595bc76d9f55373eb2a49ea0f0686
treef24e7e70e352fc64e3d833efeba77c8d0776e632
parent534933ee9bf6837fc75a389e4ed3aad4ffe1ab0f
parent415a27c1aea82bad9f7da973854c28f15cadbee3
Merge branch 'appframework-master' into public_cache

Conflicts:
lib/public/iservercontainer.php
lib/server.php
lib/public/iservercontainer.php
lib/server.php