diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-02-21 08:52:17 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-02-21 08:52:17 +0900 |
| commit | 1efbb5a78ed02f99139aa1336fb9f360960afe33 (patch) | |
| tree | 6aa6135421d628669b7f4306ac77917b5baa6cb5 | |
| parent | wip (diff) | |
| parent | Update README.md (diff) | |
| download | misskey-1efbb5a78ed02f99139aa1336fb9f360960afe33.tar.gz misskey-1efbb5a78ed02f99139aa1336fb9f360960afe33.tar.bz2 misskey-1efbb5a78ed02f99139aa1336fb9f360960afe33.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | README.md | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 78f700cb1d..a90cb13c8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ addons: - ubuntu-toolchain-r-test packages: - g++-4.8 + - graphicsmagick cache: directories: @@ -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. |