Merge branch '1.0' into 1.1

silverstripe · Dec 18, 2017 · 7767292 · 7767292
2 parents 616bcdb + c28c3c1
commit 7767292
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 
 language: php 
 php: 
- - 5.3
+ - 5.6
 
 sudo: false
 

diff --git a/.tx/config b/.tx/config