diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-11 14:29:50 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-11 14:29:50 +0300 |
| commit | 6028cac0ff0ecdefad505478fe54f770e90b60c3 (patch) | |
| tree | bfd5d3a1cf91cd2a09a88a81fafbd4de956fa52c /composer.json | |
| parent | d1683a2641a92d02057dfbe6c3c403138e36711c (diff) | |
| parent | 120a7f7d54a05e85f2a8b47f7a6fd6a85464139b (diff) | |
Merge branch 'master' into 3.x-dev
Conflicts:
core/Version.php
tests/UI/expected-ui-screenshots
tests/lib/screenshot-testing/support/chai-extras.js
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/composer.json b/composer.json index b7ebee8d64..4a15908286 100644 --- a/composer.json +++ b/composer.json @@ -107,5 +107,8 @@ "post-install-cmd": [ "Piwik\\Composer\\ScriptHandler::buildXhprof" ] + }, + "config": { + "disable-tls": true } } |