Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
components	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
containers	Fix WebUI allowing to upload more items than the limit (#12300)	2019-11-07 09:07:03 +02:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Add confirmation modal when logging out from the web app (#11671)	2019-08-26 18:24:10 +02:00