Hax -> Greg #180

Merged
greg6775 merged 6 commits from master into greg-dev 2019-12-08 21:50:17 +01:00

6 commits

Author SHA1 Message Date
Skidder
a4fee6f27a
Merge pull request #179 from BigBotNetwork/hax-dev
Hax dev
2019-12-08 21:36:37 +01:00
Hax
910289d938 Hello my friend. I'm a fix 2019-12-08 21:36:12 +01:00
Hax
b62666225d Merge remote-tracking branch 'origin/master' into hax-dev 2019-12-08 21:15:48 +01:00
Skidder
f27c2e8dd9
Merge pull request #177 from BigBotNetwork/greg-dev
Delete redundant files
2019-12-07 10:05:08 +01:00
Skidder
d51f49d505
Merge pull request #175 from BigBotNetwork/i18n
New Crowdin translations
2019-12-07 10:03:48 +01:00
Skidder
8fa008baaa
Merge pull request #140 from BigBotNetwork/greg-dev
Greg dev
2019-12-02 21:57:06 -08:00