Skip to content

Commit 32d49ff

Browse files
committed
Merge branch 'master' of https://github.com/pug-php/js-phpize
2 parents c588c27 + 2692827 commit 32d49ff

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.gitattributes

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
11
*.h diff=php
2+
3+
/examples export-ignore
4+
/tests export-ignore
5+
/.codeclimate.yml export-ignore
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.styleci.yml export-ignore
9+
/.travis.yml export-ignore
10+
/*.md export-ignore
11+
/phpunit.xml export-ignore

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php": ">=5.3.0"
1414
},
1515
"require-dev": {
16-
"phpunit/phpunit": ">=4.8",
16+
"phpunit/phpunit": ">=4.8 <6.0",
1717
"codeclimate/php-test-reporter": "dev-master"
1818
},
1919
"minimum-stability": "stable",

0 commit comments

Comments
 (0)