diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 23:19:23 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 23:19:23 +0500 |
commit | 7849a48a859302e9d3e3ed14f3de380705f3ba78 (patch) | |
tree | a7a4ad1b3edbe3656cc8a36753651a6899b72d75 /model | |
parent | e840cb612f9ddf537a0d9ec7223ea87bc15b0308 (diff) | |
parent | 3bd0a15341a5cff29c172aed73cda688e63fb7e7 (diff) | |
download | chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.tar.gz chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.tar.bz2 chat-7849a48a859302e9d3e3ed14f3de380705f3ba78.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Conflicts:
web/react/components/popover_list_members.jsx
web/react/components/user_profile.jsx
Diffstat (limited to 'model')
-rw-r--r-- | model/webhook.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/model/webhook.go b/model/webhook.go index 3bf034908..9b9969b96 100644 --- a/model/webhook.go +++ b/model/webhook.go @@ -8,6 +8,11 @@ import ( "io" ) +const ( + DEFAULT_WEBHOOK_USERNAME = "webhook" + DEFAULT_WEBHOOK_ICON = "/static/images/webhook_icon.jpg" +) + type IncomingWebhook struct { Id string `json:"id"` CreateAt int64 `json:"create_at"` |