Merge remote-tracking branch 'refs/remotes/Kwoth/master' into patch-4

# Conflicts: # NadekoBot/NadekoBot.cs # NadekoBot/NadekoBot.csproj
2016-05-02 14:23:17 +02:00
parent f48a5dfd6f d62ff049fe
commit f3ee5042b7
19 changed files with 296 additions and 103 deletions
--- a/NadekoBot/_Models/DataModels/AnnouncementModel.cs
+++ b/NadekoBot/_Models/DataModels/AnnouncementModel.cs
@ -15,5 +15,6 @@ namespace NadekoBot.DataModels
        [JsonProperty("byeChannel")]
        public long ByeChannelId { get; set; } = 0;
        public string ByeText { get; set; } = "%user% has left the server.";
+        public bool DeleteGreetMessages { get; set; } = true;
    }
 }