diff options
| author | Reverite <github@reverite.sh> | 2019-06-13 23:05:19 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-13 23:05:19 -0700 |
| commit | 7ce2a4e95331cc9ef9b782a5c4d8046d8a835a05 (patch) | |
| tree | bc4e5e39ee96ae74cbf9c09570b2e545da6587e0 /app/javascript/flavours/glitch/reducers/index.js | |
| parent | 3614718bc91f90a6dc19dd80ecf3bc191283c24e (diff) | |
| parent | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (diff) | |
Merge branch 'glitch' into production
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 45b93b92c..266d87dc1 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -28,6 +28,7 @@ import lists from './lists'; import listEditor from './list_editor'; import listAdder from './list_adder'; import filters from './filters'; +import conversations from './conversations'; import suggestions from './suggestions'; import pinnedAccountsEditor from './pinned_accounts_editor'; import polls from './polls'; @@ -64,6 +65,7 @@ const reducers = { listEditor, listAdder, filters, + conversations, suggestions, pinnedAccountsEditor, polls, |