]> source.dussan.org Git - nextcloud-server.git/commit
Merge master into ocs_api
authorTom Needham <needham.thomas@gmail.com>
Sun, 28 Oct 2012 11:16:04 +0000 (11:16 +0000)
committerTom Needham <needham.thomas@gmail.com>
Sun, 28 Oct 2012 11:16:04 +0000 (11:16 +0000)
commitbcdf3a23db6867332232f8c1b69ba3fa394e191a
tree20be51b4a2e5f1c7f8bc3a50ca3fb9571e972af3
parentb07944798848bc5196dc75e8d8caea5ca71b0f15
parent22dcd3b6a691c7a245e4d1de30f09bb17efdfceb
Merge master into ocs_api
lib/app.php
lib/base.php