Merge branch '3.1'

# Conflicts: # README.md # composer.json Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Aug 16, 2015 · 41d0eb1 · 41d0eb1
2 parents 045d07f + 8092cd9
commit 41d0eb1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: php
 
+sudo: false
+
 php:
   - 5.5
   - 5.6