Merge branch '1.1' into 1.2

2017-12-19 10:18:24 +13:00 · 2017-12-19 10:18:24 +13:00 · 646cd1a210
parent 4c87ff3896 7767292d50
commit 646cd1a210
2 changed files with 0 additions and 9 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,6 @@ sudo: false
 language: php

 php:
-  - 5.3
  - 5.4
  - 5.5
  - 5.6
--- a/.tx/config
+++ b/.tx/config
@ -1,8 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[silverstripe-widgets.master]
-file_filter = lang/<lang>.yml
-source_file = lang/en.yml
-source_lang = en
-type = YML