mirror of https://github.com/Siphonay/mastodon
00fcdebed7
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |