diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-05 17:58:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 17:58:39 +0200 |
| commit | 0aee74d78a801285ac33647791da9cb1ede9ddf4 (patch) | |
| tree | 0cf032b9cecdfc4058f59dfaa5c6197e463a5ffe /app/javascript/flavours/glitch/features/compose/components/options.js | |
| parent | ff0ceb28b3f1b19a6851a482f8203e434e50f167 (diff) | |
| parent | 68eb58b8058579f551b8aa94e800283cd0f93f7f (diff) | |
Merge pull request #1187 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/components/options.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/compose/components/options.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/components/options.js b/app/javascript/flavours/glitch/features/compose/components/options.js index ed52b1997..92348b000 100644 --- a/app/javascript/flavours/glitch/features/compose/components/options.js +++ b/app/javascript/flavours/glitch/features/compose/components/options.js @@ -7,7 +7,7 @@ import spring from 'react-motion/lib/spring'; // Components. import IconButton from 'flavours/glitch/components/icon_button'; -import TextIconButton from 'flavours/glitch/components/text_icon_button'; +import TextIconButton from './text_icon_button'; import Dropdown from './dropdown'; import ImmutablePureComponent from 'react-immutable-pure-component'; |