diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
| commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
| tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /webapp/package.json | |
| parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
| download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip | |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
Diffstat (limited to 'webapp/package.json')
| -rw-r--r-- | webapp/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/package.json b/webapp/package.json index ccc88c18c..85cdaa171 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -19,6 +19,7 @@ "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca", "match-at": "0.1.0", "mattermost": "mattermost/mattermost-javascript#master", + "match-at": "0.1.0", "object-assign": "4.1.0", "perfect-scrollbar": "0.6.11", "react": "15.0.2", @@ -26,9 +27,8 @@ "react-bootstrap": "0.29.3", "react-custom-scrollbars": "4.0.0-beta.1", "react-dom": "15.0.2", - "react-intl": "2.1.2", + "react-intl": "2.0.0-rc-1", "react-router": "2.4.0", - "react-select": "1.0.0-beta13", "react-textarea-autosize": "4.0.1", "superagent": "1.8.3", "twemoji": "2.0.5", |