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 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream		7 years ago
..
accounts	Per-user reblog hiding implementation/fixes/tests	7 years ago
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	7 years ago
lists	Lists (#5703)	7 years ago
statuses	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
timelines	Lists (#5703)	7 years ago
accounts_controller_spec.rb	Optional notification muting (#5087)	7 years ago
apps_controller_spec.rb	…
blocks_controller_spec.rb	Fix pagination in Api::V1::BlocksController (#5285)	7 years ago
custom_emojis_controller_spec.rb	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)	7 years ago
domain_blocks_controller_spec.rb	…
favourites_controller_spec.rb	…
follow_requests_controller_spec.rb	…
follows_controller_spec.rb	Fix POST /api/v1/follows error when already following (#4878)	7 years ago
instances_controller_spec.rb	…
lists_controller_spec.rb	Lists (#5703)	7 years ago
media_controller_spec.rb	Add ability to specify alternative text for media attachments (#5123)	7 years ago
mutes_controller_spec.rb	Optional notification muting (#5087)	7 years ago
notifications_controller_spec.rb	…
reports_controller_spec.rb	…
search_controller_spec.rb	…
statuses_controller_spec.rb	…
streaming_controller_spec.rb	…