diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-30 11:29:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 11:29:26 -0500 |
| commit | 257146c9608b38846c9c8431c2b293b7c3cf1c6a (patch) | |
| tree | d8a8d11acbff500f566cb2d543f81e02e6363858 /app/javascript/flavours/glitch/reducers/index.js | |
| parent | 9248d1e3a73ca97eeb5d177ef2ffcb7d4d9f614c (diff) | |
| parent | 48bcf4d6e89658abac5405683e823c68f27248f0 (diff) | |
Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes
Backport dropdown menu fixes from Mastodon
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 e9c8d7c1d..173f95cd2 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -1,4 +1,5 @@ import { combineReducers } from 'redux-immutable'; +import dropdown_menu from './dropdown_menu'; import timelines from './timelines'; import meta from './meta'; import alerts from './alerts'; @@ -27,6 +28,7 @@ import lists from './lists'; import listEditor from './list_editor'; const reducers = { + dropdown_menu, timelines, meta, alerts, |