merge: fixed conflicts in discord PR

2018-05-07 15:40:43 +02:00
parent 249c1e8d3d c4b57a2562
commit e5e8b9800c
6 changed files with 259 additions and 19 deletions
@@ -19,12 +19,13 @@ type SendEmailCommandSync struct {
 }

 type SendWebhookSync struct {
-	Url        string
-	User       string
-	Password   string
-	Body       string
-	HttpMethod string
-	HttpHeader map[string]string
+	Url         string
+	User        string
+	Password    string
+	Body        string
+	HttpMethod  string
+	HttpHeader  map[string]string
+	ContentType string
 }

 type SendResetPasswordEmailCommand struct {