Du kek #160

Merged
greg6775 merged 21 commits from master into i18n 2019-12-06 20:44:23 +01:00

21 commits

Author SHA1 Message Date
Skidder
16fd22c3ca
Merge pull request #159 from BigBotNetwork/greg-dev
Test String
2019-12-06 11:43:51 -08:00
GregTCLTK
3cff015ce1
Test string 2.0 2019-12-06 20:42:46 +01:00
GregTCLTK
2f0918fc88
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 20:21:22 +01:00
Skidder
1ed0f9644c
Merge pull request #158 from BigBotNetwork/master
Crowdin stuff
2019-12-06 11:21:12 -08:00
Skidder
5e75358229
Merge branch 'greg-dev' into master 2019-12-06 11:21:01 -08:00
Skidder
58a0f8bfe6 Update Crowdin configuration file 2019-12-06 11:18:42 -08:00
GregTCLTK
539d6003b1
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 20:15:21 +01:00
Skidder
65512e7146
Merge pull request #157 from BigBotNetwork/l10n_greg-dev
New Crowdin translations
2019-12-06 11:15:11 -08:00
GregTCLTK
83b89e28b6
Merge remote-tracking branch 'origin/l10n_greg-dev' into greg-dev 2019-12-06 20:14:53 +01:00
Skidder
78d67fccd8 New translations en.json (German) 2019-12-06 11:14:04 -08:00
Skidder
05c31dd884 New translations en.json (French) 2019-12-06 11:11:09 -08:00
Skidder
a3e19b1098 New translations en.json (Spanish) 2019-12-06 11:11:08 -08:00
Skidder
77a4ee819e New translations en.json (English) 2019-12-06 11:11:07 -08:00
Skidder
087535e120 New translations en.json (German) 2019-12-06 11:11:06 -08:00
Skidder
aa21dd536a Update Crowdin configuration file 2019-12-06 11:10:57 -08:00
GregTCLTK
32dfcb0269
Crowdin test 2019-12-06 20:09:39 +01:00
GregTCLTK
4c42a56518
.de --> .com in the code of conduct 2019-12-06 20:00:50 +01:00
GregTCLTK
d75fea75a0
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 17:38:33 +01:00
GregTCLTK
4982196fb1
Role Mention fix 2019-12-06 17:38:23 +01:00
Skidder
72f843f757
Update README.md 2019-12-05 21:23:42 +01:00
Skidder
5720399e49
Update README.md 2019-12-05 21:23:03 +01:00