f627ea99e4
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. |
||
|---|---|---|
| .. | ||
| bookmarks_controller_spec.rb | ||
| favourited_by_accounts_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| reblogged_by_accounts_controller_spec.rb | ||
| reblogs_controller_spec.rb | ||