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-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-03-18 08:47:48 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-12 07:54:53 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-12 12:54:16 +00:00
2024-09-11 08:18:10 +00:00
2024-09-12 07:54:53 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-23 08:59:31 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2023-10-31 16:05:44 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2023-06-02 15:00:27 +02:00
2024-09-11 13:59:46 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2023-07-13 14:22:20 +02:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-08-23 08:59:31 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-23 08:59:31 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-30 07:12:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-23 08:59:31 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2023-12-05 16:07:53 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-08-23 08:59:31 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00
2024-09-11 08:18:10 +00:00