From 3b37bdc0b999b7dc152dbac19742a6446142d320 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 14 Aug 2018 00:04:37 +0000
Subject: [PATCH 1/7] fix(package): update vue-style-loader to version 4.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 80c0bc53c2..6b03c645d5 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
 		"vue-json-tree-view": "2.1.4",
 		"vue-loader": "15.3.0",
 		"vue-router": "3.0.1",
-		"vue-style-loader": "4.1.1",
+		"vue-style-loader": "4.1.2",
 		"vue-template-compiler": "2.5.17",
 		"vuedraggable": "2.16.0",
 		"vuex": "3.0.1",

From cfcaf77e2155d8316935fb3ba533a19a2ffc4f87 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 14 Aug 2018 00:15:17 +0000
Subject: [PATCH 2/7] fix(package): update mongodb to version 3.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6b03c645d5..86b5986c3c 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
 		"mkdirp": "0.5.1",
 		"mocha": "5.2.0",
 		"moji": "0.5.1",
-		"mongodb": "3.1.2",
+		"mongodb": "3.1.3",
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",

From 01a0a54a2ccb4fdb50d516eee257a648a9d3d9e2 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 14 Aug 2018 01:22:41 +0000
Subject: [PATCH 3/7] fix(package): update @types/mongodb to version 3.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 86b5986c3c..25b5d37b39 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
 		"@types/minio": "6.0.2",
 		"@types/mkdirp": "0.5.2",
 		"@types/mocha": "5.2.3",
-		"@types/mongodb": "3.1.3",
+		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
 		"@types/node": "10.5.8",
 		"@types/portscanner": "2.1.0",

From 6009be34dcebaf33b9b64d8e0f6bfc0e2c9865cf Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 14 Aug 2018 01:36:09 +0000
Subject: [PATCH 4/7] fix(package): update @types/node to version 10.7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 25b5d37b39..f7d59636a5 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
 		"@types/mocha": "5.2.3",
 		"@types/mongodb": "3.1.4",
 		"@types/ms": "0.7.30",
-		"@types/node": "10.5.8",
+		"@types/node": "10.7.0",
 		"@types/portscanner": "2.1.0",
 		"@types/pug": "2.0.4",
 		"@types/qrcode": "1.2.0",

From fe418d8d9ab724470164265c7c804ec96d655d83 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 14 Aug 2018 02:17:00 +0000
Subject: [PATCH 5/7] fix(package): update @types/ws to version 6.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f7d59636a5..61820c76f0 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
 		"@types/webpack": "4.4.9",
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.39",
-		"@types/ws": "5.1.2",
+		"@types/ws": "6.0.0",
 		"animejs": "2.2.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",

From f085ecedb34c5acaaa5ec2b8e95acd6630d9c766 Mon Sep 17 00:00:00 2001
From: Skid <skid@tuto-craft.com>
Date: Tue, 14 Aug 2018 15:41:55 +0200
Subject: [PATCH 6/7] Update setup.en.md

---
 docs/setup.en.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/setup.en.md b/docs/setup.en.md
index 56632cc361..73ea636390 100644
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -62,6 +62,13 @@ npm install web-push -g
 web-push generate-vapid-keys
 ```
 
+*(optional)* Create a twitter application
+----------------------------------------------------------------
+If you want to enable the twitter integration, you need to create a twitter app at [apps.twitter.com](https://apps.twitter.com/).
+
+In the app you need to set the oauth callback url as : https://misskey-instance/api/tw/cb
+
+
 *5.* Make configuration file
 ----------------------------------------------------------------
 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`.

From f04526bacad59b3e6947a93459f1067e94cb9322 Mon Sep 17 00:00:00 2001
From: Skid <skid@tuto-craft.com>
Date: Tue, 14 Aug 2018 15:45:36 +0200
Subject: [PATCH 7/7] Update example.yml

---
 .config/example.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/example.yml b/.config/example.yml
index a4f3c0036e..ce092a08f3 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -123,6 +123,7 @@ drive:
 # google_maps_api_key: example-google-maps-api-key
 
 # Twitter integration
+# You need to set the oauth callback url as : https://<your-misskey-instance>/api/tw/cb
 # twitter:
 #   consumer_key: example-twitter-consumer-key
 #   consumer_secret: example-twitter-consumer-secret-key