Merge branch 'feature/ru' into develop
# Conflicts: # app/controller/UserController.php # config/constants/Constants.php
This commit is contained in:
@@ -98,4 +98,6 @@ class Constants
|
||||
['id' => 'xinyouhe', 'name' => '新友合'],
|
||||
['id' => 'mbaf', 'name' => 'MAGIC BRIDGE AUTO FZE']
|
||||
];
|
||||
|
||||
public const LANGUAGE = ['en', 'zh_CN','ru'];
|
||||
}
|
||||
Reference in New Issue
Block a user