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

2017-08-02 14:48:26 +12:00 · 2017-08-02 14:48:26 +12:00 · 43d128d520
parent 8bc9728104 6eed988317
commit 43d128d520
2 changed files with 5 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -4,6 +4,8 @@ language: php

 sudo: false

+sudo: false
+
 php:
 - 5.4

--- a/composer.json
+++ b/composer.json
@ -17,5 +17,5 @@
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"
-    }
+	}
 }