Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls

.travis.yml

@@ -25,6 +25,7 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
+      - graphicsmagick
 
 cache:
   directories:

README.md

@@ -33,8 +33,6 @@ and more! You can touch with your own eyes at https://misskey.xyz/.
 4. `npm install`
 5. `npm run config`
 6. `npm run build`
-7. ✌🏻💴✌🏻
-8. 🤔
 
 GLHF!
 
@@ -59,14 +57,14 @@ Misskey requires two domains called the primary domain and the secondary domain.
 
 **Ensure that the secondary domain is not a subdomain of the primary domain.**
 
-#### Dubdomains
+#### Subdomains
-Misskey uses subdomains below:
+Misskey uses following subdomains:
 
-* **api**.<primary domain>
+* **api**.*{primary domain}*
-* **auth**.<primary domain>
+* **auth**.*{primary domain}*
-* **about**.<primary domain>
+* **about**.*{primary domain}*
-* **dev**.<primary domain>
+* **dev**.*{primary domain}*
-* **file**.<secondary domain>
+* **file**.*{secondary domain}*
 
 ### reCAPTCHA
 Please visit https://www.google.com/recaptcha/intro/ and generate keys.