Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		2019-05-23 19:01:30 +02:00
..
components	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-10 17:09:12 +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