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-10-02 18:46:22 +02:00
2022-10-30 02:43:57 +02:00
2020-01-23 22:00:13 +01:00
2020-03-06 01:29:38 +01:00
2021-01-10 00:32:01 +01:00
2022-03-12 04:14:25 +01:00
2022-07-17 13:49:29 +02:00
2022-08-25 04:27:47 +02:00
2022-10-13 14:42:37 +02:00
2020-09-11 15:16:29 +02:00
2020-05-03 16:30:36 +02:00
2022-06-23 01:44:27 +02:00
2022-09-23 23:00:12 +02:00
2022-10-31 08:37:32 +01:00
2022-11-02 09:20:47 +01:00
2022-09-20 23:51:21 +02:00
2020-02-24 22:21:40 +01:00
2019-07-30 11:10:46 +02:00
2022-03-03 16:13:40 +01:00
2022-04-28 23:34:58 +02:00
2020-08-31 12:47:09 +02:00
2020-03-06 01:29:38 +01:00
2019-08-30 00:14:36 +02:00
2022-03-03 16:13:40 +01:00
2020-09-11 15:16:29 +02:00
2022-04-28 23:34:58 +02:00
2022-10-22 18:30:55 +02:00
2022-06-28 09:42:13 +02:00
2022-03-04 01:06:33 +01:00
2022-07-17 13:49:29 +02:00
2022-10-09 19:51:39 +02:00
2020-09-01 13:31:28 +02:00
2021-01-12 09:27:38 +01:00
2022-03-03 16:13:58 +01:00
2022-03-03 16:13:40 +01:00
2022-05-27 16:21:59 +02:00
2020-05-03 16:30:36 +02:00
2020-03-06 01:29:38 +01:00
2022-03-02 18:57:08 +01:00
2020-08-31 12:47:09 +02:00
2022-11-06 09:50:41 +01:00
2020-03-06 01:29:38 +01:00
2021-04-24 17:01:43 +02:00
2022-07-20 17:06:52 +02:00