diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-12 20:29:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:29:55 +0100 |
| commit | a3ba28eb17d75af37396359e8c37675e06605ccf (patch) | |
| tree | 20d81ffc7b01b132e1683685a0176ede6374c13c /app/javascript/flavours/glitch/features/composer | |
| parent | b89e003c4d049d64d2d4015357b8b931370bc5f0 (diff) | |
| parent | b47a53f90299a1fb52423aacbc0c23427e2eb132 (diff) | |
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer')
| -rw-r--r-- | app/javascript/flavours/glitch/features/composer/options/index.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/options/index.js b/app/javascript/flavours/glitch/features/composer/options/index.js index 9fe3abc03..5b4a7444c 100644 --- a/app/javascript/flavours/glitch/features/composer/options/index.js +++ b/app/javascript/flavours/glitch/features/composer/options/index.js @@ -214,6 +214,7 @@ export default class ComposerOptions extends React.PureComponent { onChange={handleChangeFiles} ref={handleRefFileElement} type='file' + multiple {...hiddenComponent} /> <Dropdown |