about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/reducers/index.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-10-26 22:54:50 +0100
committerGitHub <noreply@github.com>2020-10-26 22:54:50 +0100
commitc762ca49dc924ce32b512c2aece4d7d1e0229b5c (patch)
tree3f24094f0886e1c437230a1125fbc49dd5cf65a6 /app/javascript/flavours/glitch/reducers/index.js
parent9c88792f0a60f2b383f0d3919475403e1e244faf (diff)
parent49ee69f75f24ef13f36cb177d5278fcc3a5f3d37 (diff)
Merge pull request #1443 from ThibG/glitch-soc/features/upstream-pop-in
Port upstream's pop-in player to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
-rw-r--r--app/javascript/flavours/glitch/reducers/index.js2
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);