You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		7 years ago
..
credentials_controller_spec.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
lists_controller_spec.rb	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	7 years ago
relationships_controller_spec.rb	Fix bug in relationships API introduced by #6482 (#6527)	7 years ago
search_controller_spec.rb	…
statuses_controller_spec.rb	…