e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Merge branch 'master' of https://github.com/syuilo/misskey

Browse source
This commit is contained in:
syuilo 2017-10-22 15:22:54 +09:00
parent c964abcf75 afc338de83
commit cd5f8b526a
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -2,6 +2,10 @@ ChangeLog (Release Notes)
=========================
主に notable な changes を書いていきます
2732 (2017/10/22)
-----------------
* 依存関係の更新など
2584 (2017/09/08)
-----------------
* New: ユーザーページによく使うドメインを表示 (#771)

12
README.md
View file

@ -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