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.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		6 years ago
..
_follow_button.html.haml	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	6 years ago
_follow_grid.html.haml	Add preference to hide following/followers lists (#7532)	6 years ago
_follow_grid_hidden.html.haml	Add preference to hide following/followers lists (#7532)	6 years ago
_grid_card.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	6 years ago
_header.html.haml	Fix glitch-style bio fields incorrect HTML escaping in public profiles	6 years ago
_moved_strip.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	6 years ago
_nothing_here.html.haml	Localizations for most server-side strings	8 years ago
_og.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	6 years ago
show.html.haml	Add alternate for RSS (#7436)	6 years ago