Merge remote-tracking branch 'origin/master' into dev

2017-10-15 17:13:35 -04:00
parent ca8451720f c2db365922
commit e183167c9b
53 changed files with 1142 additions and 125 deletions
--- a/server/app/data.yml
+++ b/server/app/data.yml
@@ -84,6 +84,9 @@ langs:
  -
    id: de
    name: German - Deutsch
+  -
+    id: ja
+    name: Japanese - 日本語
  -
    id: ko
    name: Korean - 한국어