]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 16 Oct 2013 13:45:55 +0000 (15:45 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 16 Oct 2013 13:45:55 +0000 (15:45 +0200)
commitfdeef5e874ae7a8e4a23a737e5a1e948804d768a
tree2cc093162b583210b8f878f5ab9d670c270cff2e
parent60541358ac375652d74e4a5b5d8cad865833aa92
parentc3f7d22adc59949ad41c33d450b6d3e226cdefdb
Merge branch 'master' into fixing-appframework-master

Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
lib/base.php
lib/private/appframework/dependencyinjection/dicontainer.php
lib/private/helper.php
tests/lib/appframework/AppTest.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php