David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

..

accounts

…

apps

…

lists

Lists (#5703)

2017-11-18 00:16:48 +01:00

statuses

…

timelines

Lists (#5703)

2017-11-18 00:16:48 +01:00

accounts_controller_spec.rb

…

apps_controller_spec.rb

…

blocks_controller_spec.rb

…

custom_emojis_controller_spec.rb

…

domain_blocks_controller_spec.rb

…

favourites_controller_spec.rb

…

follow_requests_controller_spec.rb

…

follows_controller_spec.rb

…

instances_controller_spec.rb

…

lists_controller_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

media_controller_spec.rb

…

mutes_controller_spec.rb

…

notifications_controller_spec.rb

…

reports_controller_spec.rb

…

search_controller_spec.rb

…

statuses_controller_spec.rb

…

streaming_controller_spec.rb

…