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 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		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	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
tag_controller.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago