Merge the master branch into Greg's branch #233

Merged
greg6775 merged 15 commits from master into greg-dev 2019-12-22 11:11:20 +01:00

15 commits

Author SHA1 Message Date
Skidder
fbbd751bed
Create LICENSE 2019-12-22 10:07:21 +01:00
Skidder
f45a3b7a74
Delete LICENSE 2019-12-22 10:06:02 +01:00
Skidder
54e47fcdb0
Merge pull request #232 from BigBotNetwork/greg-dev
Merged!
2019-12-21 21:52:35 +01:00
Skidder
ec46776187
Merge pull request #231 from BigBotNetwork/i18n
New Crowdin translations
2019-12-21 20:43:44 +01:00
Skidder
230dabeb09 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-21 18:23:18 +01:00
Skidder
a5056da2e4 New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-21 18:23:16 +01:00
Skidder
4da2e1e285 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-21 18:23:15 +01:00
Skidder
e18a6008d2 New translations Translations_en.properties (French)
New French translation
2019-12-21 18:23:13 +01:00
Skidder
48321fd6a0 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-21 18:23:11 +01:00
Skidder
1305a6069e New translations Translations_en.properties (English)
New English translation
2019-12-21 18:23:09 +01:00
Skidder
40a2d9cc50 New translations Translations_en.properties (German)
New German translation
2019-12-21 18:23:08 +01:00
Skidder
395738c060
Merge pull request #230 from BigBotNetwork/greg-dev
Merged!
2019-12-21 18:14:55 +01:00
Skidder
d965d8f065
Merge pull request #221 from BigBotNetwork/i18n
New Crowdin translations
2019-12-18 19:01:55 +01:00
Skidder
eeefdb79dc New translations Translations_en.properties (English)
New English translation
2019-12-18 17:41:14 +01:00
Skidder
cc5df3c6c4 New translations Translations_en.properties (German)
New German translation
2019-12-18 17:41:13 +01:00