mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 19:56:56 +00:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |