diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-05-29 17:08:27 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-05-29 17:08:27 +0000 |
| commit | 50618b81c861a2579d47e1f007fa839f02772fbf (patch) | |
| tree | 75970137a9b6dbd180f192f3d3231c8ec793b42d /src | |
| parent | 6045708a5d1b4ad3715c755d8f10766087281095 (diff) | |
| parent | 053299584715e471bc07669b537c6e52c27e8a8e (diff) | |
Merge branch '543' into 'develop'
Fix "stale user settings shown after save"
Closes #543
See merge request pleroma/pleroma-fe!813
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index efff23d1..a2bb6e4c 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -43,7 +43,7 @@ export const parseUser = (data) => { output.name = data.display_name output.name_html = addEmojis(data.display_name, data.emojis) - // output.description = ??? missing + output.description = data.note output.description_html = addEmojis(data.note, data.emojis) // Utilize avatar_static for gif avatars? |