mastodon/spec/fixtures/files
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
4096x4097.png
attachment.gif
attachment.jpg
attachment.webm
avatar.gif
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
mini-static.gif
mute-imports.txt
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
utf8-followers.txt Support UTF-8 Characters in Domains During CSV Import (#20592) 2022-11-14 05:52:13 +01:00