summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-10-22 15:22:54 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-10-22 15:22:54 +0900
commitcd5f8b526a006fd3037bb4d8a4065e67a1974ea7 (patch)
treee254232dd398cf88493e1121fe4fd557ac910d41
parentモバイル版からでもクライアントバージョンを確認でき... (diff)
parentUpdate CHANGELOG.md (diff)
downloadmisskey-cd5f8b526a006fd3037bb4d8a4065e67a1974ea7.tar.gz
misskey-cd5f8b526a006fd3037bb4d8a4065e67a1974ea7.tar.bz2
misskey-cd5f8b526a006fd3037bb4d8a4065e67a1974ea7.zip
Merge branch 'master' of https://github.com/syuilo/misskey
-rw-r--r--CHANGELOG.md4
-rw-r--r--README.md12
2 files changed, 4 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c45400f884..58ec237093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ ChangeLog (Release Notes)
=========================
主に notable な changes を書いていきます
+2732 (2017/10/22)
+-----------------
+* 依存関係の更新など
+
2584 (2017/09/08)
-----------------
* New: ユーザーページによく使うドメインを表示 (#771)
diff --git a/README.md b/README.md
index 2e05298e1d..3aeac828e3 100644
--- a/README.md
+++ b/README.md
@@ -42,14 +42,6 @@ If you want to donate to Misskey, please get in touch with [@syuilo][syuilo-link
**Note:** When you donate to Misskey, your name will be displayed in [donors](./DONORS.md).
-Collaborators
-----------------------------------------------------------------
-| ![syuilo][syuilo-icon] | ![Morisawa Aya][ayamorisawa-icon] | ![otofune][otofune-icon] |
-|------------------------|-----------------------------------|---------------------------------|
-| [syuilo][syuilo-link] | [Aya Morisawa][ayamorisawa-link] | [otofune][otofune-link] |
-
-[List of all contributors](https://github.com/syuilo/misskey/graphs/contributors)
-
Copyright
----------------------------------------------------------------
Misskey is an open-source software licensed under [The MIT License](LICENSE).
@@ -67,7 +59,3 @@ Misskey is an open-source software licensed under [The MIT License](LICENSE).
<!-- Collaborators Info -->
[syuilo-link]: https://syuilo.com
[syuilo-icon]: https://avatars2.githubusercontent.com/u/4439005?v=3&s=70
-[ayamorisawa-link]: https://github.com/ayamorisawa
-[ayamorisawa-icon]: https://avatars0.githubusercontent.com/u/10798641?v=3&s=70
-[otofune-link]: https://github.com/otofune
-[otofune-icon]: https://avatars0.githubusercontent.com/u/15062473?v=3&s=70