Library/laravel-prometheus-exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

merge upstream changes

Browse source
This commit is contained in:
Bertus Steenberg 2019-10-17 13:30:22 +02:00
commit ac7003ff49
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog.md
View file

@ -1,5 +1,9 @@
# Changelog # Changelog
## 1.0.4 - 2019-10-17
* Enable Laravel 6.0 compatability
## 1.0.3 - 2019-02-11 ## 1.0.3 - 2019-02-11
* Enable package discovery for laravel 5.5+ * Enable package discovery for laravel 5.5+

6
composer.json
View file

@ -10,9 +10,15 @@
], ],
"require": { "require": {
"php": ">=5.6.0", "php": ">=5.6.0",
<<<<<<< HEAD
"illuminate/support": "^4.0", "illuminate/support": "^4.0",
"illuminate/routing": "^4.0", "illuminate/routing": "^4.0",
"jimdo/prometheus_client_php": "^0.9.1" "jimdo/prometheus_client_php": "^0.9.1"
=======
"illuminate/support": "^5.3 || ^6.0",
"illuminate/routing": "^5.3 || ^6.0",
"jimdo/prometheus_client_php": "^0.9.0"
>>>>>>> c1cd48549fb5270120d4c529e6dad739383843fc
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {