Claire
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
2023-07-02 11:12:16 +02:00
2023-07-11 12:26:09 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-22 17:54:43 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-07-02 11:49:08 +02:00
2023-05-25 15:42:37 +02:00
2023-07-11 12:26:09 +02:00
2023-06-13 19:26:25 +02:00
2023-07-13 11:49:16 +02:00
2023-07-10 19:33:07 +02:00
2023-06-22 17:54:43 +02:00
2023-06-13 19:26:25 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-07-13 17:59:15 +02:00
2023-05-23 17:15:17 +02:00
2023-07-13 14:21:08 +02:00
2023-05-30 19:01:42 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-05-23 17:15:17 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-06-13 19:26:25 +02:00
2023-07-08 20:01:08 +02:00
2023-07-12 15:00:10 +02:00
2023-05-25 15:42:37 +02:00
2023-06-22 17:54:43 +02:00
2023-05-23 17:15:17 +02:00
2023-07-08 11:12:20 +02:00
2023-06-13 19:26:25 +02:00
2023-07-10 18:26:56 +02:00
2023-05-23 17:15:17 +02:00
2023-07-13 15:53:03 +02:00
2023-05-23 17:15:17 +02:00
2023-07-17 17:32:46 +02:00
2023-05-23 17:15:17 +02:00