Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:00 +0000 (15:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:00 +0000 (15:39 +0100)
1  2 
tine20/composer.json

diff --combined tine20/composer.json
@@@ -28,7 -28,7 +28,7 @@@
          "phpword/phpword": "dev-master",
          "sabre/dav": "1.8.*",
          "sabre/vobject": "3.1.3 as 2.1.313",
 -        "metaways/opendocument": "0.2",
 +        "metaways/opendocument": "1.0",
          "metaways/timezoneconvert": "0.2",
          "zendframework/zend-http": "2.2.8-p3 as 2.2.8"
      },
@@@ -50,5 -50,8 +50,8 @@@
          ]
      },
      "include-path-desc": "ZF1 still needs include path as it does not consequently use autoloading internally",
-     "include-path": ["", "library/zf1ext", "library"]
+     "include-path": ["", "library/zf1ext", "library"],
+     "config": {
+         "secure-http": false
+     }
  }