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