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 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		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	…
_nothing_here.html.haml	…
_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