Merge branch 'master' into 'l10n_master'

# Conflicts: # crowdin.yml
2018-07-23 10:12:18 +00:00 · 2018-07-23 10:12:18 +00:00 · 2895051671
commit 2895051671
parent 77074f972e 64a08651ef
1 changed files with 3 additions and 1 deletions
--- a/crowdin.yml
+++ b/crowdin.yml
@ -1 +1,3 @@
-# crowdin config
+files:
+  - source: /translations
+    translation: /translations/%two_letters_code%