mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-12 22:44:28 +00:00
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |