From 5772eed8f7b13aeb5c23146a6ffb3e141cbab46d Mon Sep 17 00:00:00 2001
From: Matthew Taylor <mewtaylor@gmail.com>
Date: Tue, 5 Sep 2017 12:28:01 -0400
Subject: [PATCH] use lodash instead of assign

this fixes #1500, since lodash works in ie11 but `assign` does not
---
 src/redux/reducer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/redux/reducer.js b/src/redux/reducer.js
index b1f18e77f..951b03a8a 100644
--- a/src/redux/reducer.js
+++ b/src/redux/reducer.js
@@ -1,4 +1,5 @@
 var combineReducers = require('redux').combineReducers;
+var defaults = require('lodash.defaults');
 
 var messageCountReducer = require('./message-count.js').messageCountReducer;
 var permissionsReducer = require('./permissions.js').permissionsReducer;
@@ -16,7 +17,7 @@ var sessionReducer = require('./session.js').sessionReducer;
  */
 module.exports = function (opts) {
     opts = opts || {};
-    return combineReducers(Object.assign(opts, {
+    return combineReducers(defaults(opts, {
         session: sessionReducer,
         permissions: permissionsReducer,
         messageCount: messageCountReducer