Merge remote-tracking branch 'origin/1.1' into 1.2

This commit is contained in:
Robbie Averill 2017-08-02 14:47:53 +12:00
commit 6eed988317
2 changed files with 5 additions and 3 deletions

View File

@ -4,6 +4,8 @@ language: php
sudo: false
sudo: false
php:
- 5.4

View File

@ -16,5 +16,5 @@
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
}
}
}