Mastodon

History

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