Merge branch '1.0' into 1.1

2017-12-19 10:17:43 +13:00 · 2017-12-19 10:17:43 +13:00 · 7767292d50
parent 616bcdb364 c28c3c1d8d
commit 7767292d50
2 changed files with 1 additions and 9 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,7 +2,7 @@

 language: php 
 php: 
- - 5.3
+ - 5.6

 sudo: false

--- 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