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