Merge branch 'master' into mastodon-site-api

diff --cc config/routes.rb
index 4595b4ba38f94a00428b8e8b4ebcd137adbe85c0,a0c76f8296d9f7ab8170b4561d9743ca934ca59b..1a2e3c19d7dc4d26af4c08f9b7a24c02ab141021
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -127,9 -127,9 +127,10 @@@ Rails.application.routes.draw d
        resources :media,      only: [:create]
        resources :apps,       only: [:create]
        resources :blocks,     only: [:index]
+       resources :mutes,      only: [:index]
        resources :favourites, only: [:index]
        resources :reports,    only: [:index, :create]
 +      resources :site,       only: [:index]
  
        resources :follow_requests, only: [:index] do
          member do

diff --cc docs/Using-the-API/API.md
index 8dcf2a842fc8e43ce451146396f07b5610a6ce47,af785828635403420979e856dca769e12d135f12..2c323d559d80655b17998c7a086d8680aefa746d
--- 1/docs/Using-the-API/API.md
--- 2/docs/Using-the-API/API.md
+++ b/docs/Using-the-API/API.md
@@@ -208,13 -226,13 +227,20 @@@ Returns the updated relationship to th
  
  Returns the updated relationship to the user.
  
 +### Getting site information
 +
 +**GET /api/v1/site**
 +
 +Returns an object containing the `title`, character limit (`max_chars`), and an object of `links` for the site.
 +Does not require authentication.
 +
+ # Muting and unmuting users
+ 
+ **POST /api/v1/accounts/:id/mute**
+ **POST /api/v1/accounts/:id/unmute**
+ 
+ Returns the updated relationship to the user.
+ 
  ### OAuth apps
  
  **POST /api/v1/apps**