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

2019-02-15 08:40:25 +09:00
parent 514b830910 e4f799bf1d
commit 66b79e5e24
2 changed files with 3 additions and 1 deletions
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@ -76,6 +76,7 @@ export default Vue.extend({
 			if (note.replyId != null) return;
 			if (note.renoteId != null) return;
 			if (note.poll != null) return;
+			if (note.localOnly) return;

 			this.notes.unshift(note);
 		},