Merge branch 'release-4.0'

webapp/yarn.lock

@@ -5029,9 +5029,9 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-marked@mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317:
+marked@mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53:
   version "0.3.5"
-  resolved "https://codeload.github.com/mattermost/marked/tar.gz/8f5902fff9bad793cd6c66e0c44002c9e79e1317"
+  resolved "https://codeload.github.com/mattermost/marked/tar.gz/c0b5f4a651b0af63e974522b20b93b7999490c53"
 
 match-at@0.1.0:
   version "0.1.0"
@@ -5045,9 +5045,9 @@ math-expression-evaluator@^1.2.14:
   version "1.2.16"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
 
-mattermost-redux@mattermost/mattermost-redux#webapp-master:
+mattermost-redux@mattermost/mattermost-redux#webapp-4.0:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/a850fc2696c7083a068f7852c1d4b8bce0ec72ba"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/ea67cb97d1e34b251e13a356583223284f544aa5"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"