Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02: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