mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 00:46:12 +00:00
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. |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |