mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01: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. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
mailer_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
stream_entries_helper.rb |