diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-26 22:54:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 22:54:50 +0100 |
| commit | c762ca49dc924ce32b512c2aece4d7d1e0229b5c (patch) | |
| tree | 3f24094f0886e1c437230a1125fbc49dd5cf65a6 /app/javascript/flavours/glitch/features/ui/index.js | |
| parent | 9c88792f0a60f2b383f0d3919475403e1e244faf (diff) | |
| parent | 49ee69f75f24ef13f36cb177d5278fcc3a5f3d37 (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/features/ui/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js index 1294a8a16..61a34fd2b 100644 --- a/app/javascript/flavours/glitch/features/ui/index.js +++ b/app/javascript/flavours/glitch/features/ui/index.js @@ -19,6 +19,7 @@ import PermaLink from 'flavours/glitch/components/permalink'; import ColumnsAreaContainer from './containers/columns_area_container'; import classNames from 'classnames'; import Favico from 'favico.js'; +import PictureInPicture from 'flavours/glitch/features/picture_in_picture'; import { Compose, Status, @@ -614,6 +615,7 @@ class UI extends React.Component { {children} </SwitchingColumnsArea> + <PictureInPicture /> <NotificationsContainer /> <LoadingBarContainer className='loading-bar' /> <ModalContainer /> |