diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-03-30 14:50:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-30 14:50:02 -0400 |
commit | 3304cb681dd1a9a555bc981a0a287baea713b402 (patch) | |
tree | 6cff3c770f6e693a58145bdc8fde741f777e2d40 /app/javascript/flavours/glitch/reducers/index.js | |
parent | 257146c9608b38846c9c8431c2b293b7c3cf1c6a (diff) | |
parent | 218cc261d1681a24f6330a53bf7b9589faa721ec (diff) |
Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui
Port #6628 to glitch-soc flavour
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/index.js b/app/javascript/flavours/glitch/reducers/index.js index 173f95cd2..dc8cb6834 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -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, |