Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2018-01-26 00:49:00 -08:00
commit cc025a6a72
107 changed files with 293 additions and 181 deletions

View file

@ -517,7 +517,7 @@ Requires a JSON object that represents the API to cancel forwarding to.
}
```
It will return a message if event forwarding was cancelled successfully.
It will return a message if event forwarding was canceled successfully.
```json
{