diff options
| author | dave <starpumadev@gmail.com> | 2019-03-29 10:11:28 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-29 10:11:28 -0400 |
| commit | 783cc00dd0ea24b98bc8442b60c91be387428a7e (patch) | |
| tree | 216663f5877e9f444009b3b8ef900aa646202d4c /src/components/status/status.js | |
| parent | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (diff) | |
| parent | 25370083b63328ad489f4f0676a4bfa33de59671 (diff) | |
merge develop & resolve conflict
Diffstat (limited to 'src/components/status/status.js')
| -rw-r--r-- | src/components/status/status.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index c90da6d4..550fe76f 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -310,7 +310,6 @@ const Status = { this.replying = !this.replying }, gotoOriginal (id) { - // only handled by conversation, not status_or_conversation if (this.inConversation) { this.$emit('goto', id) } |