mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 11:43:05 -05:00
702d162998
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.
Mastodon Glitch Edition
Now with automated deploys!
So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?
- You can view documentation for this project at glitch-soc.github.io/docs/.
- And contributing guidelines are available here and here.