diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 22:21:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 22:21:58 +0100 |
| commit | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (patch) | |
| tree | 18daedde9a2b7087e0b5e160680ed366cdd02546 /app/javascript/flavours/glitch/reducers/index.js | |
| parent | 8c9c05d57914236dc7104a67e84743e1ce36f7cc (diff) | |
| parent | 41ef41b9006e42b4001ebd89a3091fce609359fc (diff) | |
Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/reducers/index.js b/app/javascript/flavours/glitch/reducers/index.js index d9123b103..92348c0c5 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -17,7 +17,7 @@ import push_notifications from './push_notifications'; import status_lists from './status_lists'; import mutes from './mutes'; import blocks from './blocks'; -import reports from './reports'; +import rules from './rules'; import boosts from './boosts'; import contexts from './contexts'; import compose from './compose'; @@ -64,7 +64,7 @@ const reducers = { push_notifications, mutes, blocks, - reports, + rules, boosts, contexts, compose, |