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		2018-03-02 21:46:44 -06:00
..
direct_controller.rb	Added a timeline for Direct statuses	2017-10-22 18:35:14 -07:00
home_controller.rb	Fix home regeneration (#6251)	2018-01-17 23:56:03 +01:00
list_controller.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
public_controller.rb	Add only_media param to public and hashtag timelines API (#6576)	2018-03-01 03:21:21 +01:00
tag_controller.rb	Add only_media param to public and hashtag timelines API (#6576)	2018-03-01 03:21:21 +01:00