Merge remote-tracking branch 'origin/dev' into dev

2017-06-27 08:49:53 -04:00
parent 1d612f15c8 04e71129cf
commit daae56e37e
2 changed files with 3 additions and 2 deletions
--- a/src/Discord.Net.Core/Entities/Messages/EmbedType.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedType.cs
@@ -7,6 +7,7 @@
        Video,
        Image,
        Gifv,
-        Article
+        Article,
+        Tweet
    }
 }