Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02:00
..
bookmarks_controller.rb
favourited_by_accounts_controller.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
favourites_controller.rb
mutes_controller.rb
pins_controller.rb
reblogged_by_accounts_controller.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
reblogs_controller.rb