shpuld e13c8c3fd2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme		2017-11-17 02:17:47 +02:00
..
conversation.js	Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading.	2017-11-13 16:33:54 +02:00
conversation.vue	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme	2017-11-17 02:17:47 +02:00