Merge branch 'release/1.12.0'

pluginsGLPI · Oct 27, 2020 · c276be6 · c276be6
2 parents 7ffd805 + f6ca6db
commit c276be6
Show file tree

Hide file tree

Showing 49 changed files with 1,752 additions and 995 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ php:
 
 services:
   - mysql
-
 env:
   global:
     - DB=mysql

diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "require": {
-        "php": "^7.2"
+        "php": "^7.2",
+        "symfony/yaml": "^4.4"
     },
     "require-dev": {
         "atoum/atoum": "^3.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ php: @@
     services:
       - mysql
     env:
       global:
         - DB=mysql
@@ Expand Down @@