diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-10-28 19:11:21 -0500 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-10-28 19:11:21 -0500 |
commit | 84a56390fda455e4bf42d0d9f44527bfbf207dfc (patch) | |
tree | a951d84e093c2406eb9587e0559ca43cd827625c /app/javascript/flavours/glitch/reducers/index.js | |
parent | ecaf21464226b5cecc6d100165f7d1265afdffb9 (diff) | |
parent | 5a41704f8926d9594c66028ca30dc1fc0f98da3d (diff) |
Merge remote-tracking branch 'upstream/master' into dev
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 cadbd01a3..b1ddb769e 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -38,6 +38,7 @@ import trends from './trends'; import announcements from './announcements'; import markers from './markers'; import account_notes from './account_notes'; +import picture_in_picture from './picture_in_picture'; const reducers = { announcements, @@ -79,6 +80,7 @@ const reducers = { trends, markers, account_notes, + picture_in_picture, }; export default combineReducers(reducers); |