diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-22 22:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 22:38:11 +0200 |
| commit | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (patch) | |
| tree | 3f5e2b47d242c4044f0cd69433501834399879d5 /app/javascript/flavours/glitch/features/getting_started/components/announcements.js | |
| parent | 29870d2be6c0e78132416b5561aba20d6ca3c746 (diff) | |
| parent | 5c60f7eaedbc2dc6184f8b2a4d99f58fdbd5b26b (diff) | |
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/getting_started/components/announcements.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/getting_started/components/announcements.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js index acaa78fe3..cd81d07de 100644 --- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js +++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js @@ -15,6 +15,7 @@ import EmojiPickerDropdown from 'flavours/glitch/features/emoji_picker'; import AnimatedNumber from 'flavours/glitch/components/animated_number'; import TransitionMotion from 'react-motion/lib/TransitionMotion'; import spring from 'react-motion/lib/spring'; +import { assetHost } from 'flavours/glitch/util/config'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, @@ -153,8 +154,6 @@ class Content extends ImmutablePureComponent { } -const assetHost = process.env.CDN_HOST || ''; - class Emoji extends React.PureComponent { static propTypes = { |