Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
..
2022-06-09 22:25:23 +02:00
2022-11-01 15:06:52 +01:00
2024-03-01 14:51:01 +00:00
2022-04-27 23:05:24 +02:00
2022-06-09 22:25:23 +02:00
2024-03-19 09:03:15 +00:00
2018-01-06 18:38:19 -08:00
2018-01-06 18:25:19 -08:00
2023-04-23 22:24:53 +02:00
2018-01-17 23:56:03 +01:00
2018-01-20 01:32:37 +01:00
2020-01-23 22:00:13 +01:00
2018-01-17 23:56:03 +01:00
2024-08-22 17:12:35 +00:00
2023-06-22 23:48:40 +02:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2022-04-27 23:05:24 +02:00
2022-04-27 23:05:24 +02:00
2022-04-27 23:05:24 +02:00
2022-04-27 23:05:24 +02:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2018-01-05 16:22:58 -08:00
2018-01-05 16:22:58 -08:00
2022-04-27 23:05:24 +02:00
2022-12-15 17:10:34 +01:00
2022-12-15 17:10:34 +01:00
2022-06-11 20:32:02 +02:00
2022-11-01 15:06:52 +01:00
2024-10-24 07:28:22 +00:00
2022-11-01 15:06:52 +01:00
2024-03-07 12:59:00 +01:00
2018-01-05 16:22:58 -08:00
2022-11-01 15:06:52 +01:00
2024-01-25 15:41:31 +00:00