Merge branch '3.4' into 3.5

This commit is contained in:
Sam Minnee 2017-04-24 15:59:38 +12:00
commit 18171f8875
1 changed files with 0 additions and 14 deletions

View File

@ -1,14 +0,0 @@
[main]
host = https://www.transifex.com
[silverstripe-cms.master]
file_filter = lang/<lang>.yml
source_file = lang/en.yml
source_lang = en
type = YML
[silverstripe-cms.master-js]
file_filter = javascript/lang/src/<lang>.js
source_file = javascript/lang/src/en.js
source_lang = en
type = KEYVALUEJSON