Merge branch 'master' into develop

2017-05-14 22:56:24 +02:00 · 2017-05-14 22:56:24 +02:00 · c1c6c2dd97
commit c1c6c2dd97
parent 4810c045a4 fed425fce3
7 changed files with 58 additions and 228 deletions
--- a/composer.json
+++ b/composer.json
@ -11,7 +11,6 @@
    "symfony/yaml": "~3.2.0",
    "symfony/process": "~3.2.0",
    "ptachoire/process-builder-chain": "~1.2.0",
-    "rudloff/smarty-plugin-noscheme": "~0.1.0",
    "guzzlehttp/guzzle": "~6.2.0",
    "aura/session": "~2.1.0",
    "barracudanetworks/archivestream-php": "~1.0.5"
@ -80,6 +79,6 @@
    }
  },
  "scripts": {
-    "compile": "composer install --dev"
+    "compile": "composer install --ignore-platform-reqs"
  }
 }