]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into type-hinting
authorBart Visscher <bartv@thisnet.nl>
Mon, 31 Mar 2014 19:38:54 +0000 (21:38 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 31 Mar 2014 19:38:54 +0000 (21:38 +0200)
commit6b061c236dd5730837b567f2c39a19af1617d33c
tree27de0d46deae2987ea398f2f2aee4e26786c6f48
parent8951328a87c16e5ebfe4d3e5c392347db1e54f92
parentab696edba685cd6d2a64c2e48907f03197aae53f
Merge branch 'master' into type-hinting

Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
lib/private/image.php
lib/private/l10n.php
lib/private/server.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
lib/public/iservercontainer.php
settings/admin/controller.php
tests/lib/appframework/routing/RoutingTest.php