Skip to content

Commit 54ea5c9

Browse files
patricksamsonpatricksamson
committed
Merge pull request #4 from Lykegenes/dev
Merge for release
2 parents bcf222d + 0b609ac commit 54ea5c9

File tree

15 files changed

+226
-3202
lines changed

15 files changed

+226
-3202
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/vendor
1+
/vendor
2+
composer.lock

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: php
22

3+
sudo: false
4+
35
php:
46
- 5.5
57
- 5.6

‎composer.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
],
1919
"require": {
2020
"illuminate/support": "~5.1",
21-
"illuminate/http": "~5.1",
22-
"league/fractal": "^0.12.0",
23-
"sofa/eloquence": "~5.1"
21+
"illuminate/http": "~5.1"
2422
},
2523
"require-dev": {
2624
"phpunit/phpunit" : "4.*",

0 commit comments

Comments
 (0)