Merge branch 'master' into voice-api

polyfloyd · polyfloyd · commit f5faf4f3b0c3 · 2018-03-05T14:16:01.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,10 @@
 language: go
 
 go:
-  - 1.4
-  - tip
+  - 1.8
+  - stable
+  - master
+
+matrix:
+  allow_failures:
+    - go: master
diff --git a/message.go b/message.go
@@ -70,7 +70,7 @@ type messageRequest struct {
 	Validity          int         `json:"validity,omitempty"`
 	Gateway           int         `json:"gateway,omitempty"`
 	TypeDetails       TypeDetails `json:"typeDetails,omitempty"`
-	DataCoding        string      `json:"dataCoding,omitempty"`
+	DataCoding        string      `json:"datacoding,omitempty"`
 	MClass            int         `json:"mclass,omitempty"`
 	ScheduledDatetime string      `json:"scheduledDatetime,omitempty"`
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ type messageRequest struct {`
`70`	`70`	Validity int `json:"validity,omitempty"`
`71`	`71`	Gateway int `json:"gateway,omitempty"`
`72`	`72`	TypeDetails TypeDetails `json:"typeDetails,omitempty"`
`73`		- DataCoding string `json:"dataCoding,omitempty"`
	`73`	+ DataCoding string `json:"datacoding,omitempty"`
`74`	`74`	MClass int `json:"mclass,omitempty"`
`75`	`75`	ScheduledDatetime string `json:"scheduledDatetime,omitempty"`
`76`	`76`	`}`