From: Eugen <eugen@zeonfederated.com>
Date: Wed, 15 Mar 2017 21:55:22 +0000 (+0100)
Subject: Merge branch 'master' into mastodon-site-api
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e245115f47082ffba27205f508301d14e792c369;p=mastodon.git

Merge branch 'master' into mastodon-site-api
---

e245115f47082ffba27205f508301d14e792c369
diff --cc config/routes.rb
index 4595b4ba3,a0c76f829..1a2e3c19d
--- a/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 8dcf2a842,af7858286..2c323d559
--- a/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**