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 - ubuntu-toolchain-r-test
packages: packages:
- g++-4.8 - g++-4.8
- graphicsmagick
cache: cache:
directories: directories:

View file

@ -33,8 +33,6 @@ and more! You can touch with your own eyes at https://misskey.xyz/.
4. `npm install` 4. `npm install`
5. `npm run config` 5. `npm run config`
6. `npm run build` 6. `npm run build`
7. ✌🏻💴✌🏻
8. 🤔
GLHF! 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.** **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 ### reCAPTCHA
Please visit https://www.google.com/recaptcha/intro/ and generate keys. Please visit https://www.google.com/recaptcha/intro/ and generate keys.