David Yip 201e82686f

Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -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

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

tag_controller.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00