Merge branch 'release/2.6.0'

pluginsGLPI · Jun 28, 2018 · 6a0dd68 · 6a0dd68
2 parents 5d4d0f2 + 4731d1b
commit 6a0dd68
Show file tree

Hide file tree

Showing 39 changed files with 1,168 additions and 984 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 php:
- - 5.5
  - 5.6
  - 7.0
  - 7.1
+ - 7.2
  - nightly
 
 #env:

diff --git a/.tx/config b/.tx/config
@@ -1,9 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[glpi-project-plugin-genericobject.genericobjectpot]
+[glpi-project-plugin-genericobject.genericobject-pot]
 file_filter = locales/<lang>.po
 source_file = locales/genericobject.pot
 source_lang = en
 type = PO
-minimum_perc: 100
diff --git a/composer.json b/composer.json
@@ -1,7 +1,10 @@
 {
- "minimum-stability": "dev",
- "prefer-stable": true,
  "require-dev": {
- "glpi-project/tools": "^0.1.2"
+ "glpi-project/tools": "^0.1"
+ },
+ "config": {
+ "platform": {
+ "php": "5.6"
+ }
  }
 }