diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-11 00:41:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-11 00:41:10 +0800 |
commit | 6ba6431548e34146dbc103443d66f9b550ae40d8 (patch) | |
tree | 8261c7e29b90e34b0b717673e787f0afa12679cc /webapp/utils | |
parent | 5f823d703dafcc0a9ed80452e9d5dcf4a00a1219 (diff) | |
download | chat-6ba6431548e34146dbc103443d66f9b550ae40d8.tar.gz chat-6ba6431548e34146dbc103443d66f9b550ae40d8.tar.bz2 chat-6ba6431548e34146dbc103443d66f9b550ae40d8.zip |
Merge 4.0.3 into release-4.1 (#7169)
* fix dm custom slash command regression (#7008)
* point mattermost-redux to webapp-4.0 latest (#7040)
* If login is using mobile respond with JSON object (#7030)
* Allow regions to be set and honored for S3 driver. (#7010) (#7073)
This is necessary for certain users where
GetBucketLocation API is disabled using IAM
policies. There is a field AmazonS3Region
which we need to re-purpose and use to support
this properly.
Fixes https://github.com/mattermost/platform/issues/6999
* [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7106)
* make config locales more forgiving by assigning default values
* fix error text
* update per comment
* Minor updates to team
* Another team update
Diffstat (limited to 'webapp/utils')
0 files changed, 0 insertions, 0 deletions