Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
..
2024-07-22 17:38:30 +02:00
2024-09-04 05:12:25 +00:00
2024-09-11 08:01:32 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-05 14:06:58 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 19:38:52 +02:00
2023-11-08 14:43:17 +00:00
2024-07-12 14:09:16 +00:00
2024-09-04 05:12:25 +00:00
2023-07-20 18:23:48 +02:00
2023-11-07 15:47:01 +00:00
2023-05-08 19:28:43 +02:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2023-05-04 05:49:08 +02:00
2023-06-06 13:58:33 +02:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-06-17 13:41:58 +02:00
2024-09-04 05:12:25 +00:00
2024-07-03 20:05:59 +00:00
2024-09-12 11:14:42 +00:00
2024-09-04 05:12:25 +00:00
2024-07-03 20:05:59 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-03-13 15:42:39 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2023-06-22 14:55:22 +02:00
2023-06-06 13:58:33 +02:00
2024-07-25 15:02:58 +00:00
2024-09-04 05:12:25 +00:00
2024-07-23 14:42:31 +00:00