Skip to content

Commit 7da94ce

Browse files
committed
Merge branch 'release/2.5.0'
2 parents dd1d59b + 54b11ea commit 7da94ce

2 files changed

Lines changed: 49 additions & 48 deletions

File tree

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"minimum-stability": "dev",
33
"prefer-stable": true,
44
"require-dev": {
5+
"glpi-project/tools": "^0.1.2"
56
},
67
"require": {
7-
"zendframework/zend-loader": "^2.5",
8-
"glpi-project/tools": "^0.1.2"
8+
"zendframework/zend-loader": "^2.5"
99
}
1010
}

composer.lock

Lines changed: 47 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)