Merge branch 'release/2.5.0'

pluginsGLPI · Dec 13, 2017 · 7da94ce · 7da94ce
2 parents dd1d59b + 54b11ea
commit 7da94ce
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 48 deletions.
diff --git a/composer.json b/composer.json
@@ -2,9 +2,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require-dev": {
+        "glpi-project/tools": "^0.1.2"
     },
     "require": {
-        "zendframework/zend-loader": "^2.5",
-        "glpi-project/tools": "^0.1.2"
+        "zendframework/zend-loader": "^2.5"
     }
 }
diff --git a/composer.lock b/composer.lock