glitchier-soc/app/javascript/mastodon/features/compose
Thibaut Girka a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
..
components Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-03 14:54:30 +02:00
containers fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Add forceSingleColumn prop to <UI /> (#10807) 2019-05-23 01:35:22 +02:00