Fix conflict

This commit is contained in:
Khionu Sybiern 2018-12-21 18:05:34 -05:00
commit bf134bd1e2
No known key found for this signature in database
GPG key ID: 413876C958506934
2 changed files with 7 additions and 0 deletions

View file

@ -556,6 +556,13 @@
"inviteCode": "zH7NUgz",
"githubUrl": "https://github.com/godotengine/"
},
{
"logo": "tes3mp.png",
"title": "TES3MP",
"quote": "Discord helps us provide immediate support to our players and keeps us in touch with them every day in a way that is far more personal and social than our forums and subreddit.",
"inviteCode": "ECJk293",
"githubUrl": "https://github.com/TES3MP/openmw-tes3mp"
},
{
"logo": "amethyst.png",
"title": "Amethyst Game Engine",

BIN
logos/tes3mp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB