diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-28 23:23:33 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-28 23:23:33 +0500 |
| commit | e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9 (patch) | |
| tree | 92415fbb46ddc0d2c083a45ec1d342cf13ce27b0 /api | |
| parent | 2bfe9eea5634fbfd1af328e28c4d1ef8d0411d5c (diff) | |
| parent | b15bda8328bf052d7b61075dda8c16dbad59cde8 (diff) | |
| download | chat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.tar.gz chat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.tar.bz2 chat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1762
Diffstat (limited to 'api')
| -rw-r--r-- | api/file.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/file.go b/api/file.go index 889c9dd1b..3ef50fbbd 100644 --- a/api/file.go +++ b/api/file.go @@ -33,7 +33,7 @@ func InitFile(r *mux.Router) { sr := r.PathPrefix("/files").Subrouter() sr.Handle("/upload", ApiUserRequired(uploadFile)).Methods("POST") - sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+\\.[A-Za-z0-9]{3,}}", ApiAppHandler(getFile)).Methods("GET") + sr.Handle("/get/{channel_id:[A-Za-z0-9]+}/{user_id:[A-Za-z0-9]+}/{filename:([A-Za-z0-9]+/)?.+(\\.[A-Za-z0-9]{3,})?}", ApiAppHandler(getFile)).Methods("GET") sr.Handle("/get_public_link", ApiUserRequired(getPublicLink)).Methods("POST") } |