Merge branch '2.0' into 2.1

2017-12-18 18:17:06 +13:00 · 2017-12-18 18:17:06 +13:00 · b68ff56624
parent 8e79a1368e 4e2965e86b
commit b68ff56624
2 changed files with 0 additions and 9 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -8,7 +8,6 @@ addons:
      - tidy

 php:
-  - 5.3
  - 5.4
  - 5.5

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