imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
credentials_controller_spec.rb	Fix a spuriously failing spec that assumed we required short bios like upstream	2017-09-10 19:43:52 -05:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
lists_controller_spec.rb	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	2017-12-12 03:55:39 +01:00
relationships_controller_spec.rb	Fix bug in relationships API introduced by #6482 (#6527)	2018-02-21 23:22:12 +01:00
search_controller_spec.rb
statuses_controller_spec.rb	Pinned statuses (#4675)	2017-08-25 01:41:18 +02:00