logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: d94a7b63185ce72bd9a61ebc7f6141178176fc4e
parent: ed3aceff5cfbd9497e488147583c97d68acfa127
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Wed, 10 Apr 2019 12:06:35 +0000

Merge branch 'fix-local' into 'develop'

Fix wrong property read in pleroma object

See merge request pleroma/pleroma-fe!747

Diffstat:

Msrc/services/entity_normalizer/entity_normalizer.service.js2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js @@ -194,7 +194,7 @@ export const parseStatus = (data) => { output.text = pleroma.content ? data.pleroma.content['text/plain'] : data.content output.summary = pleroma.spoiler_text ? data.pleroma.spoiler_text['text/plain'] : data.spoiler_text output.statusnet_conversation_id = data.pleroma.conversation_id - output.is_local = pleroma.is_local + output.is_local = pleroma.local } else { output.text = data.content output.summary = data.spoiler_text