Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui

Port #6628 to glitch-soc flavour
This commit is contained in:
beatrix
2018-03-30 14:50:02 -04:00
committed by GitHub
14 changed files with 271 additions and 17 deletions

View File

@@ -6,6 +6,7 @@ import alerts from './alerts';
import { loadingBarReducer } from 'react-redux-loading-bar';
import modal from './modal';
import user_lists from './user_lists';
import domain_lists from './domain_lists';
import accounts from './accounts';
import accounts_counters from './accounts_counters';
import statuses from './statuses';
@@ -35,6 +36,7 @@ const reducers = {
loadingBar: loadingBarReducer,
modal,
user_lists,
domain_lists,
status_lists,
accounts,
accounts_counters,