summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-01 20:59:18 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-01 20:59:18 +0900
commit358299cf0e0ae3feddbc2f43842c34b50afd9912 (patch)
treea157eedffabc8993625329080aa32e1876b2c854
parentMerge branch 'develop' (diff)
parent11.8.0-2 (diff)
downloadmisskey-358299cf0e0ae3feddbc2f43842c34b50afd9912.tar.gz
misskey-358299cf0e0ae3feddbc2f43842c34b50afd9912.tar.bz2
misskey-358299cf0e0ae3feddbc2f43842c34b50afd9912.zip
Merge branch 'develop'
-rw-r--r--CHANGELOG.md4
-rw-r--r--package.json2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d0eefb2dc..4e8c13e70c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,10 @@ mongodb:
8. master ブランチに戻す
9. enjoy
+11.8.0-2 (2019/05/01)
+-------------------
+* 11.8.0 のリリース内容が 11.7.0 と同一だったのを修正
+
11.8.0 (2019/05/01)
-------------------
### Improvements
diff --git a/package.json b/package.json
index 3b3ad742a2..e7489ef2ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "11.8.0",
+ "version": "11.8.0-2",
"codename": "daybreak",
"repository": {
"type": "git",