mastodon/app/views/accounts
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	config/i18n-tasks.yml
2018-03-18 20:21:17 -05:00
..
_follow_button.html.haml Improve public account cards (#6559) 2018-02-26 16:18:41 +01:00
_follow_grid.html.haml Optimize follower_accounts and following_accounts (#2820) 2017-05-06 04:03:07 +02:00
_grid_card.html.haml Improve public account cards (#6559) 2018-02-26 16:18:41 +01:00
_header.html.haml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
_moved_strip.html.haml Profile redirect notes (#5746) 2017-11-18 19:39:02 +01:00
_nothing_here.html.haml
_og.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00
show.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00