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