337fc136fd
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. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||