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 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		7 years ago
..
direct_controller.rb	Added a timeline for Direct statuses	7 years ago
home_controller.rb	Fix home regeneration (#6251)	7 years ago
list_controller.rb	Lists (#5703)	7 years ago
public_controller.rb	Add only_media param to public and hashtag timelines API (#6576)	7 years ago
tag_controller.rb	Add only_media param to public and hashtag timelines API (#6576)	7 years ago