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/features/ui/index.js | |
| parent | ecaf21464226b5cecc6d100165f7d1265afdffb9 (diff) | |
| parent | 5a41704f8926d9594c66028ca30dc1fc0f98da3d (diff) | |
Merge remote-tracking branch 'upstream/master' into dev
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 9b4e99905..fa18f84b3 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, @@ -616,6 +617,7 @@ class UI extends React.Component { {children} </SwitchingColumnsArea> + <PictureInPicture /> <NotificationsContainer /> <LoadingBarContainer className='loading-bar' /> <ModalContainer /> |