Merge branch '1.1' into 1.2

silverstripe · Dec 18, 2017 · 646cd1a · 646cd1a
2 parents 4c87ff3 + 7767292
commit 646cd1a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ sudo: false
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6

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