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