Merge branch 'develop' into feature/stream

Conflicts: composer.lock
2016-12-26 15:14:23 +01:00 · 2016-12-26 15:14:23 +01:00 · 1a6e995262
commit 1a6e995262
parent ce9f794395 cc3f662cb7
2 changed files with 9 additions and 9 deletions
--- a/composer.json
+++ b/composer.json
@ -6,7 +6,7 @@
  "type": "project",
  "require": {
    "smarty/smarty": "~3.1.29",
-    "slim/slim": "~3.6.0",
+    "slim/slim": "~3.7.0",
    "mathmarques/smarty-view": "~1.1.0",
    "symfony/yaml": "~3.2.0",
    "symfony/process": "~3.2.0",