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-03-12 09:51:30 +00:00
2024-08-06 06:53:59 +00:00
2024-01-16 10:27:26 +00:00
2024-08-21 07:08:58 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-05-19 17:07:32 +00:00
2024-09-03 21:51:53 +02:00
2024-09-05 09:39:59 +00:00
2024-07-25 17:05:54 +00:00
2024-07-25 17:05:54 +00:00
2024-05-27 09:24:59 +00:00
2024-07-01 14:45:48 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-05-19 17:07:32 +00:00
2024-03-20 17:21:03 +00:00
2024-01-16 10:27:26 +00:00
2024-08-21 07:08:58 +00:00
2024-08-21 07:08:58 +00:00
2024-08-26 16:42:46 +00:00
2024-05-24 08:25:42 +00:00
2024-06-26 19:33:38 +00:00
2024-09-11 13:59:46 +00:00
2024-04-12 09:42:12 +00:00
2024-08-19 14:41:32 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-07-25 17:05:54 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-08-30 09:37:39 +00:00
2024-09-12 08:16:07 +00:00
2024-09-12 12:54:16 +00:00
2024-07-25 17:05:54 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-05-19 17:07:32 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-09-12 09:41:19 +00:00
2024-09-12 12:54:16 +00:00
2024-01-16 10:27:26 +00:00
2024-09-12 12:54:16 +00:00
2024-01-16 10:27:26 +00:00
2024-08-27 14:55:51 +00:00