From 38dd85daab8e8342ec608d24cf81254c0dfde95c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 20 Nov 2016 19:39:18 +0100
Subject: Adding notifications column

---
 .../javascripts/components/reducers/index.jsx      | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'app/assets/javascripts/components/reducers/index.jsx')

diff --git a/app/assets/javascripts/components/reducers/index.jsx b/app/assets/javascripts/components/reducers/index.jsx
index 1e015cf74..aea9239f8 100644
--- a/app/assets/javascripts/components/reducers/index.jsx
+++ b/app/assets/javascripts/components/reducers/index.jsx
@@ -1,26 +1,28 @@
-import { combineReducers }   from 'redux-immutable';
-import timelines             from './timelines';
-import meta                  from './meta';
-import compose               from './compose';
-import notifications         from './notifications';
+import { combineReducers } from 'redux-immutable';
+import timelines from './timelines';
+import meta from './meta';
+import compose from './compose';
+import alerts from './alerts';
 import { loadingBarReducer } from 'react-redux-loading-bar';
-import modal                 from './modal';
-import user_lists            from './user_lists';
-import accounts              from './accounts';
-import statuses              from './statuses';
-import relationships         from './relationships';
-import search                from './search';
+import modal from './modal';
+import user_lists from './user_lists';
+import accounts from './accounts';
+import statuses from './statuses';
+import relationships from './relationships';
+import search from './search';
+import notifications from './notifications';
 
 export default combineReducers({
   timelines,
   meta,
   compose,
-  notifications,
+  alerts,
   loadingBar: loadingBarReducer,
   modal,
   user_lists,
   accounts,
   statuses,
   relationships,
-  search
+  search,
+  notifications
 });
-- 
cgit