Merge branch 'release/2.0.4'

pluginsGLPI · Sep 10, 2018 · 211bf27 · 211bf27
2 parents 1cfd4bb + fd6c7c4
commit 211bf27
Show file tree

Hide file tree

Showing 21 changed files with 625 additions and 358 deletions.
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[glpi-plugin-sccm.sccm-pot]
+file_filter = locales/<lang>.po
+source_file = locales/sccm.pot
+source_lang = en_GB
+type = PO
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Extend GLPI with Plugins.
 
 ## Synopsis
 
-Plugin to synchronize computers from SCCM (version 1802) to GLPI (version 9.2).
+Plugin to synchronize computers from SCCM (version 1802) to GLPI (version 9.2 and 9.3).
 It uses the "FusionInventory for GLPI" plugin and the power of its internal engine:
 
 ### Workflow

diff --git a/composer.json b/composer.json
@@ -1,11 +1,13 @@
 {
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "require": {
         "php": ">= 7.0.0"
     },
     "require-dev": {
-        "glpi-project/tools": "^0.1.0",
-        "glpi-project/coding-standard": "0.5.0"
+        "glpi-project/tools": "^0.1"
+    },
+    "config": {
+        "platform": {
+            "php": "7.0"
+        }
     }
 }