From 5d06da4db2fedbe8e8c942a23782f53a5ebdf5ff Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Apr 2019 05:13:38 +0900
Subject: [PATCH 1/4] Update CHANGELOG.md

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1755ce43b..24971bbed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,36 @@ If you encounter any problems with updating, please try the following:
 1. `npm run clean` or `npm run cleanall`
 2. Retry update (Don't forget `npm i`)
 
+How to migrate to v11 from v10
+------------------------------
+1. v11をインストールしたい場所に syuilo/misskey をクローン
+2. config を設定する
+	* PostgreSQL(`db`)の設定とは別に、v10からMongoDBの設定をコピペしてくる(例は下にあります)
+	* `id`の設定を`meid`または`objectid`にする
+
+``` yml
+db:
+  host: localhost
+  port: 5432
+  db: misskey
+  user: x
+  pass: x
+
+mongodb:
+  user: x
+  pass: x
+  host: localhost
+  port: 27017
+  db: misskey
+```
+3. `npm i`
+4. `npm run build`
+5. `npm run init`
+6. migration ブランチに切り替え
+7. `npm run migrate`
+8. master ブランチに戻す
+9. enjoy
+
 11.2.0 (2019/04/18)
 -------------------
 ### Improvements

From 643f7d1803203d0bc4b3466e4465985e619b17b3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 20 Apr 2019 05:19:28 +0900
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24971bbed..0fd56d870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,10 +27,10 @@ mongodb:
   port: 27017
   db: misskey
 ```
-3. `npm i`
-4. `npm run build`
-5. `npm run init`
-6. migration ブランチに切り替え
+3. migration ブランチに切り替え
+4. `npm i`
+5. `npm run build`
+6. `npm run init`
 7. `npm run migrate`
 8. master ブランチに戻す
 9. enjoy

From 0ba71c6a4761569913583bd5babfcb6275bc0410 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 21 Apr 2019 02:30:18 +0900
Subject: [PATCH 3/4] Fix #4752 (#4759)

---
 src/misc/id/meid.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc/id/meid.ts b/src/misc/id/meid.ts
index d4dc73b4f..30bbdf169 100644
--- a/src/misc/id/meid.ts
+++ b/src/misc/id/meid.ts
@@ -22,5 +22,5 @@ function getRandom() {
 }
 
 export function genMeid(date: Date): string {
-	return 'f' + getTime(date.getTime()) + getRandom();
+	return getTime(date.getTime()) + getRandom();
 }

From ae43aa1bc03eff2dc6f8fc46ea779d62f34eba54 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 21 Apr 2019 06:52:01 +0900
Subject: [PATCH 4/4] 11.2.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fd56d870..7ee7122da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,12 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.2.1 (2019/04/21)
+-------------------
+### Fixes
+* MEIDが25桁になっているのを修正
+* リモートユーザー情報が更新されない問題を修正
+
 11.2.0 (2019/04/18)
 -------------------
 ### Improvements
diff --git a/package.json b/package.json
index 409bdda15..ad4968e1f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.2.0",
+	"version": "11.2.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",