Fix conflict

2018-12-21 18:05:34 -05:00 · 2018-12-21 18:05:34 -05:00 · bf134bd1e2
commit bf134bd1e2
parent 43e4a315e5 958dc900db
2 changed files with 7 additions and 0 deletions
--- a/communities.json
+++ b/communities.json
@ -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",
--- a/logos/tes3mp.png
+++ b/logos/tes3mp.png