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 67e77f230e Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.		7 years ago
..
_follow_button.html.haml	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
_follow_grid.html.haml	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
_grid_card.html.haml	Improve public account cards (#6559)	7 years ago
_header.html.haml	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
_moved_strip.html.haml	Profile redirect notes (#5746)	7 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)	7 years ago
show.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago