You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		7 years ago
..
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	…