Claire
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream ...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +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-09-25 10:50:09 +02:00
2023-09-29 10:04:18 +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-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-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-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-09-28 10:44: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-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-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-19 16:26:51 +02:00
2023-09-26 10:47:16 +02:00
2023-09-26 10:47: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-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-09-18 13:46:07 +02:00
702d162998