From 779ee46489ee804264fba79fc34ec1fa9a652360 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 29 Dec 2015 01:57:17 -0400
Subject: [PATCH] Moved features and emojis from ExtendedGuild to Guild

---
 src/Discord.Net/API/Client/Common/ExtendedGuild.cs | 6 ------
 src/Discord.Net/API/Client/Common/Guild.cs         | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Discord.Net/API/Client/Common/ExtendedGuild.cs b/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
index 55dc0f503..9da0355ca 100644
--- a/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
+++ b/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
@@ -24,11 +24,5 @@ namespace Discord.API.Client
         public bool IsLarge { get; set; }
         [JsonProperty("unavailable")]
         public bool? Unavailable { get; set; }
-
-        //Unknown
-        [JsonProperty("features")]
-        public object Features { get; set; }
-        [JsonProperty("emojis")]
-        public object Emojis { get; set; }
     }
 }
diff --git a/src/Discord.Net/API/Client/Common/Guild.cs b/src/Discord.Net/API/Client/Common/Guild.cs
index 085e6e525..401136c97 100644
--- a/src/Discord.Net/API/Client/Common/Guild.cs
+++ b/src/Discord.Net/API/Client/Common/Guild.cs
@@ -24,7 +24,12 @@ namespace Discord.API.Client
         public string Region { get; set; }
         [JsonProperty("roles")]
         public Role[] Roles { get; set; }
+
         [JsonProperty("splash")]
         public object Splash { get; set; }
+        [JsonProperty("features")]
+        public object Features { get; set; }
+        [JsonProperty("emojis")]
+        public object Emojis { get; set; }
     }
 }