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
..
2022-03-17 19:23:39 +01:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-06 09:50:41 +01:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-06 09:50:41 +01:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-06 09:50:41 +01:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2021-04-22 00:04:58 +02:00
2019-09-16 15:11:01 +02:00
2022-03-17 09:33:25 +09:00
2022-05-06 21:53:22 +09:00
2019-09-29 17:10:01 +02:00
2021-05-08 17:12:56 +02:00
2019-08-17 22:02:37 +02:00
2022-06-04 13:44:49 +09:00
2019-09-20 23:05:23 +02:00
2021-04-22 00:04:58 +02:00
2022-11-01 18:42:04 +09:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-11-13 23:24:55 +01:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2019-06-12 15:56:18 +02:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2022-11-01 18:42:04 +09:00
2019-09-16 15:11:01 +02:00
2021-04-22 00:04:58 +02:00
2019-09-16 15:11:01 +02:00
2020-11-09 00:56:52 +01:00
2020-05-13 22:35:20 +02:00
2021-04-22 00:04:58 +02:00
2020-07-02 00:45:15 +02:00
2020-07-02 00:45:15 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-11-09 00:56:52 +01:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00
2022-11-05 19:54:26 +09:00