Merge branch 'master' into patch-7

Running-Mastodon/Docker-Guide.md

@@ -14,7 +14,7 @@ The project now includes a `Dockerfile` and a `docker-compose.yml` file (which r
 
 Clone Mastodon's repository.
 
-    git clone git@github.com:tootsuite/mastodon.git
+    git clone https://github.com/tootsuite/mastodon
     cd mastodon
 
 Review the settings in `docker-compose.yml`. Note that it is **not default** to store the postgresql database and redis databases in a persistent storage location. If you plan on running your instance in production, you **must** uncomment the [`volumes` directive](https://github.com/tootsuite/mastodon/blob/972f6bc861affd9bc40181492833108f905a04b6/docker-compose.yml#L7-L16) in `docker-compose.yml`.
@@ -65,6 +65,8 @@ If you wish to run this as a daemon process instead of monitoring it on console,
 
 Then you may login to your new Mastodon instance by browsing to http://localhost:3000/
 
+If you set `LOCAL_HTTPS` to true before, you have to prepare your TLS nginx first [production guide](Production-guide.md) because connecting to port 3000 redirects you to HTTPS. 
+
 Following that, make sure that you read the [production guide](Production-guide.md). You are probably going to want to understand how
 to configure Nginx to make your Mastodon instance available to the rest of the world.
 

Using-Mastodon/Apps.md

@@ -102,7 +102,7 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |**[Autopost to Mastodon](https://wordpress.org/plugins/autopost-to-mastodon/)**|Wordpress plugin|<https://github.com/L1am0/mastodon_wordpress_autopost>|[L1am0](http://l1am0.eu/)|
 |**[MastodonToTwitter](https://github.com/halcy/MastodonToTwitter/blob/master/README.md)**|CLI|<https://github.com/halcy/MastodonToTwitter>|[@halcy@mastodon.social](https://mastodon.social/@halcy)|
 |**[Retoot](https://gitlab.com/mojo42/retoot/blob/master/README.md)**|CLI|<https://gitlab.com/mojo42/retoot>|[@Mojo@apoil.org](https://apoil.org/users/mojo)|
-|**[Mastodon Twitter Poster](https://mastodon-twitter-poster.herokuapp.com)**|Service|<https://github.com/renatolond/mastodon-twitter-poster>|[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)|
+|**[Mastodon Twitter Poster](https://crossposter.masto.donte.com.br)**|Service|<https://github.com/renatolond/mastodon-twitter-poster>|[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)|
 |**[RSSTootalizer](https://github.com/blind-coder/rsstootalizer/blob/master/README.md)**|Web browser|<https://github.com/blind-coder/rsstootalizer>|[@blindcoder@toot.berlin](https://toot.berlin/users/blindcoder)|
 |**[t2m – Twitter 2 Mastodon](https://github.com/Psycojoker/t2m/blob/master/README.md)**|CLI|<https://github.com/Psycojoker/t2m>|Psycojoker|
 |**[umrc](https://github.com/Ulrar/umrc/blob/master/README.md)**|IRC|<https://github.com/Ulrar/umrc>|[@lemonnierk@ulrar.net](https://mastodon.ulrar.net/users/lemonnierk)|

Using-the-API/API.md

@@ -27,6 +27,7 @@ API overview
   - [Attachment](#attachment)
   - [Card](#card)
   - [Context](#context)
+  - [Emoji](#emoji)
   - [Error](#error)
   - [Instance](#instance)
   - [Mention](#mention)
@@ -640,6 +641,14 @@ ___
 | `ancestors`              | The ancestors of the status in the conversation, as a list of [Statuses](#status)   | no       |
 | `descendants`            | The descendants of the status in the conversation, as a list of [Statuses](#status) | no       |
 
+### Emoji
+
+| Attribute                | Description                        | Nullable |
+|--------------------------|------------------------------------|----------|
+| `shortcode`              | The shortcode of the emoji         | no       |
+| `static_url`             | URL to the emoji static image      | no       |
+| `url`                    | URL to the emoji image             | no       |
+
 ### Error
 
 | Attribute                | Description                        | Nullable |
@@ -716,6 +725,7 @@ ___
 | `reblog`                 | `null` or the reblogged [Status](#status)                                     | yes      |
 | `content`                | Body of the status; this will contain HTML (remote HTML already sanitized)    | no       |
 | `created_at`             | The time the status was created                                               | no       |
+| `emojis`                 | An array of [Emoji](#emoji)                                                   | yes      |
 | `reblogs_count`          | The number of reblogs for the status                                          | no       |
 | `favourites_count`       | The number of favourites for the status                                       | no       |
 | `reblogged`              | Whether the authenticated user has reblogged the status                       | yes      |