Merge branch 'dev' into feature/rich-embeds

2016-11-14 19:58:58 -04:00
parent 3698dbfedc b2948deaf7
commit 8c5f5ffb7d
8 changed files with 112 additions and 65 deletions
--- a/src/Discord.Net.Rest/DiscordRestConfig.cs
+++ b/src/Discord.Net.Rest/DiscordRestConfig.cs
@@ -6,7 +6,6 @@ namespace Discord.Rest
    {
        public static string UserAgent { get; } = $"DiscordBot (https://github.com/RogueException/Discord.Net, v{Version})";
        
-        internal const int RestTimeout = 10000;
        internal const int MessageQueueInterval = 100;
        internal const int WebSocketQueueInterval = 100;