Skip to content

Commit 6a0dd68

Browse files
committed
Merge branch 'release/2.6.0'
2 parents 5d4d0f2 + 4731d1b commit 6a0dd68

39 files changed

+1168
-984
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: php
22
php:
3-
- 5.5
43
- 5.6
54
- 7.0
65
- 7.1
6+
- 7.2
77
- nightly
88

99
#env:

.tx/config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[glpi-project-plugin-genericobject.genericobjectpot]
4+
[glpi-project-plugin-genericobject.genericobject-pot]
55
file_filter = locales/<lang>.po
66
source_file = locales/genericobject.pot
77
source_lang = en
88
type = PO
9-
minimum_perc: 100

composer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2-
"minimum-stability": "dev",
3-
"prefer-stable": true,
42
"require-dev": {
5-
"glpi-project/tools": "^0.1.2"
3+
"glpi-project/tools": "^0.1"
4+
},
5+
"config": {
6+
"platform": {
7+
"php": "5.6"
8+
}
69
}
710
}

0 commit comments

Comments
 (0)