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

This commit is contained in:
syuilo 2017-02-21 08:52:17 +09:00
commit 1efbb5a78e
2 changed files with 8 additions and 9 deletions

View file

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

View file

@ -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
Misskey uses subdomains below:
#### Subdomains
Misskey uses following subdomains:
* **api**.<primary domain>
* **auth**.<primary domain>
* **about**.<primary domain>
* **dev**.<primary domain>
* **file**.<secondary domain>
* **api**.*{primary domain}*
* **auth**.*{primary domain}*
* **about**.*{primary domain}*
* **dev**.*{primary domain}*
* **file**.*{secondary domain}*
### reCAPTCHA
Please visit https://www.google.com/recaptcha/intro/ and generate keys.