aboutsummaryrefslogtreecommitdiff
path: root/src/components/conversation/conversation.vue
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-11-16 13:56:48 +0000
committerlambda <pleromagit@rogerbraun.net>2017-11-16 13:56:48 +0000
commit86e685ac3452e42c3276e6ea2d3e7988abf2941a (patch)
treea8e96d01cf0de16c603d87243902b56a3dc7bc25 /src/components/conversation/conversation.vue
parentb1ddaf919839637f50ad5b6e4742b56f2e312c47 (diff)
parent0b0d2062956b7dfc9ba3a513530d766bc3f9ae16 (diff)
Merge branch 'fix/timeline-softlock' into 'develop'
Fix timeline softlock when switching from a loading timeline See merge request pleroma/pleroma-fe!164
Diffstat (limited to 'src/components/conversation/conversation.vue')
0 files changed, 0 insertions, 0 deletions