Claire
4415005de7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict caused because of minor code style change upstream, while glitch-soc
has different code for handling variable maximum chars.
Ported the change.
- `app/serializers/initial_state_serializer.rb`:
Conflict because glitch-soc had two extra attributes where upstream added
one.
Added upstream's attribute.
2022-05-16 22:29:05 +02:00
..
2022-03-17 19:23:39 +01:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-16 22:29:05 +02:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-16 22:29:05 +02:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-16 09:42:32 +02:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-16 09:42:32 +02:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2021-04-22 00:04:58 +02:00
2022-03-17 09:33:25 +09:00
2022-05-06 21:53:22 +09:00
2021-05-08 17:12:56 +02:00
2021-04-22 00:04:58 +02:00
2021-04-22 00:04:58 +02:00
2021-04-22 00:04:58 +02:00
2021-04-22 00:04:58 +02:00
2020-12-16 03:24:55 +01:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00
2022-05-15 18:04:59 +09:00