Claire
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream ...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-20 13:05:56 +02:00
2023-09-22 11:06:48 +02:00
2023-09-19 16:26:51 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-28 10:44:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-22 11:06:48 +02:00
2023-09-06 17:23:58 +02:00
2023-09-25 10:50:09 +02:00
2023-09-22 11:06:48 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-02 13:35:29 +02:00
2023-10-02 13:35:29 +02:00
2023-09-13 15:10:41 +02:00
2023-10-02 13:35:29 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-25 10:50:09 +02:00
2023-07-13 11:49:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-28 10:44:16 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-06-02 15:00:27 +02:00
2023-06-05 09:52:36 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-02 13:35:29 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-07-13 14:22:20 +02:00
2023-09-13 15:10:41 +02:00
2023-10-03 10:47:28 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-18 13:46:07 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-10-04 10:53:04 +02:00
2023-10-02 13:35:29 +02:00
2023-09-13 15:10:41 +02:00
2023-09-19 16:26:51 +02:00
2023-10-02 13:35:29 +02:00
2023-10-02 13:35:29 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-13 15:10:41 +02:00
2023-09-25 10:50:09 +02:00
2023-09-25 10:50:09 +02:00
2023-10-03 10:47:28 +02:00
86c9c5afa0