summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-17 00:33:10 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-17 00:33:10 +0900
commita583939767dbaa882b453f8b1fbadb678a9e9cb3 (patch)
tree0480f02bc25809ce8110c50cad724d67eadb4ceb
parentMeta を二重にデータベースに保存できないように (diff)
parentCorrect syntax error (#4718) (diff)
downloadmisskey-a583939767dbaa882b453f8b1fbadb678a9e9cb3.tar.gz
misskey-a583939767dbaa882b453f8b1fbadb678a9e9cb3.tar.bz2
misskey-a583939767dbaa882b453f8b1fbadb678a9e9cb3.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
-rw-r--r--docs/examples/misskey.nginx2
-rw-r--r--src/client/app/common/scripts/note-mixin.ts2
-rw-r--r--src/client/style.styl2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/misskey.nginx b/docs/examples/misskey.nginx
index 2b4a0548e6..2bc92fa492 100644
--- a/docs/examples/misskey.nginx
+++ b/docs/examples/misskey.nginx
@@ -29,7 +29,7 @@ server {
listen [::]:443 http2;
server_name example.tld;
ssl on;
- ssl_session_cache shared:ssl_session_cache:10m;
+ ssl_session_cache shared:ssl_session_cache:10m;
# To use Let's Encrypt certificate
ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem;
diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index 67bbe8c0ae..4b454f8800 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -134,7 +134,7 @@ export default (opts: Opts = {}) => ({
},
reactDirectly(reaction) {
- (this.$root.api('notes/reactions/create', {
+ this.$root.api('notes/reactions/create', {
noteId: this.appearNote.id,
reaction: reaction
});
diff --git a/src/client/style.styl b/src/client/style.styl
index c6a8e4f19d..968e66e754 100644
--- a/src/client/style.styl
+++ b/src/client/style.styl
@@ -1,4 +1,4 @@
-@charset 'utf-8'
+@charset "utf-8"
/*
::selection