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

..

accounts

Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)

2017-12-12 03:55:39 +01:00

apps

…

instances

Represent numbers by strings in instance activity API (#6198)

2018-01-05 22:38:33 +01:00

lists

Add list of lists component to web UI (#5811)

2017-12-05 23:02:27 +01:00

statuses

…

timelines

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

2018-01-17 18:37:09 -06:00

accounts_controller.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

apps_controller.rb

…

blocks_controller.rb

…

custom_emojis_controller.rb

…

domain_blocks_controller.rb

…

favourites_controller.rb

…

follow_requests_controller.rb

…

follows_controller.rb

…

instances_controller.rb

…

lists_controller.rb

Limit users to 50 lists, remove pagination from lists API (#5933)

2017-12-09 01:32:29 +01:00

media_controller.rb

…

mutes_controller.rb

…

notifications_controller.rb

…

reports_controller.rb

…

search_controller.rb

…

statuses_controller.rb

…

streaming_controller.rb

…