Skip to content

Commit b4f548d

Browse files
aaronpkaaronpk
committed
Merge pull request #20 from aaronpk/master
update php-mf2 dependency, add tests for relative protocol resolving
2 parents 0f2cd13 + 591ed9e commit b4f548d

File tree

8 files changed

+22
-1043
lines changed

8 files changed

+22
-1043
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.phar
2+
composer.lock
23
.DS_Store
3-
/vendor/
4+
/vendor/

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.3
43
- 5.4
54
- 5.5
65
- 5.6

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"minimum-stability": "dev",
2020
"require": {
21-
"php": ">=5.3",
22-
"mf2/mf2": "0.2.*"
21+
"php": ">=5.4",
22+
"mf2/mf2": "~0.2"
2323
},
2424
"require-dev": {
2525
"phpunit/phpunit": ">=4.8.13"

0 commit comments

Comments
 (0)