Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
4096x4097.png	Error message for avatar image that's too large. #9204 (#9518)	2018-12-14 05:07:21 +01:00
attachment.gif	Fix #2108 - Fix gif uploads (#2171)	2017-04-19 23:21:00 +02:00
attachment.jpg	Add API to upload media attachments	2016-09-05 17:46:36 +02:00
attachment.webm	Fixing image upload limits, allowing webm, merge/unmerge events trigger	2016-09-12 18:22:43 +02:00
avatar.gif	When avatar/header are GIF, generate static versions (#1428)	2017-04-11 00:38:58 +02:00
bookmark-imports.txt	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
boop.ogg	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
domain_allows.csv	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
domain_blocks.csv	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
emojo.png	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
imports.txt	Imports controller errors (#1553)	2017-04-11 21:40:14 +02:00
mini-static.gif	Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)	2017-10-26 22:48:35 +09:00
mute-imports.txt	Export and import hide_notifications alongside user mutes (#10335)	2019-04-03 18:17:43 +02:00
new-following-imports.txt	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
new-mute-imports.txt	Export and import hide_notifications alongside user mutes (#10335)	2019-04-03 18:17:43 +02:00