Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
bookmarks_controller.rb
favourited_by_accounts_controller.rb
favourites_controller.rb
mutes_controller.rb
pins_controller.rb
reblogged_by_accounts_controller.rb
reblogs_controller.rb