mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-23 21:56:47 +00:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |