mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 19:56:56 +00:00
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |