DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-12-12 16:35:45 -08:00
parent a85d5cfe92 9c108873e9
commit 8e8d9118e9
3 changed files with 270 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -13,6 +13,8 @@ services:
php: php:
- 5.6 - 5.6
- 7.0 - 7.0
- 7.2
- 7.1.4
# execute any number of scripts before the test run, custom env's are available as variables # execute any number of scripts before the test run, custom env's are available as variables
before_script: before_script:

2
composer.json
View file

@ -16,7 +16,7 @@
"fideloper/proxy": "^3.1", "fideloper/proxy": "^3.1",
"intervention/image": "^2.3", "intervention/image": "^2.3",
"javiereguiluz/easyslugger": "^1.0", "javiereguiluz/easyslugger": "^1.0",
"laravel/framework": "5.4.29", "laravel/framework": "5.4.35",
"laravel/passport": "^3.0", "laravel/passport": "^3.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"laravelcollective/html": "^5.3", "laravelcollective/html": "^5.3",

459
composer.lock generated
View file

File diff suppressed because it is too large Load diff