chuckya/app/views/accounts
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.
2018-04-08 19:05:02 -05:00
..
_follow_button.html.haml Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) 2018-04-08 13:40:22 +02:00
_follow_grid.html.haml Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) 2018-04-08 13:40:22 +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 gs-master 2018-04-01 20:24:50 -05:00
_moved_strip.html.haml Profile redirect notes (#5746) 2017-11-18 19:39:02 +01:00
_nothing_here.html.haml Localizations for most server-side strings 2016-11-16 00:55:33 +01:00
_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