From 45e7ad0c3428b4a050fedb354048f8a66aedf2a0 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 10 Jul 2017 13:58:01 -0400 Subject: Fix out of order posts for admins plus two minor fixes (#6886) --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/package.json') diff --git a/webapp/package.json b/webapp/package.json index ac9febbf3..9e1dd4dcb 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -24,7 +24,7 @@ "localforage": "1.5.0", "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317", "match-at": "0.1.0", - "mattermost-redux": "mattermost/mattermost-redux#webapp-master", + "mattermost-redux": "mattermost/mattermost-redux#webapp-4.0", "object-assign": "4.1.1", "pdfjs-dist": "1.8.474", "perfect-scrollbar": "0.7.1", -- cgit v1.2.3-1-g7c22 From 22d34476e5d8d98baeec506f24e78ea0ff8932b9 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 14 Jul 2017 13:47:13 -0400 Subject: PLT-7133 Updated marked to fix escaping of autolinked email addresses (#6942) --- webapp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/package.json') diff --git a/webapp/package.json b/webapp/package.json index 9e1dd4dcb..4870c5ce8 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -22,7 +22,7 @@ "jquery": "3.2.1", "key-mirror": "1.0.1", "localforage": "1.5.0", - "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317", + "marked": "mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53", "match-at": "0.1.0", "mattermost-redux": "mattermost/mattermost-redux#webapp-4.0", "object-assign": "4.1.1", -- cgit v1.2.3-1-g7c22