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
..
credentials_controller_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-08 19:05:02 -05:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
lists_controller_spec.rb
relationships_controller_spec.rb	Fix bug in relationships API introduced by #6482 (#6527)	2018-02-21 23:22:12 +01:00
search_controller_spec.rb
statuses_controller_spec.rb