diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-16 11:38:25 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-16 11:38:25 -0500 |
commit | 48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869 (patch) | |
tree | 7ba35bc8353d5398934bb73692ec40ee47a81404 /web | |
parent | d03b3830976c96aab59cb78177cfd0e82cc05b8d (diff) | |
parent | 49a459d696fc8fee0b508990fca571fb8d2f2654 (diff) | |
download | chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.tar.gz chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.tar.bz2 chat-48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869.zip |
Merge release branch 'release-1.2'
Diffstat (limited to 'web')
-rw-r--r-- | web/web.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/web.go b/web/web.go index ffc791cb7..02ceb69ba 100644 --- a/web/web.go +++ b/web/web.go @@ -989,7 +989,7 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) { } text := parsedRequest.Text - if len(text) == 0 { + if len(text) == 0 && parsedRequest.Attachments == nil { c.Err = model.NewAppError("incomingWebhook", "No text specified", "") return } |