diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-02-15 06:20:55 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-02-15 06:20:55 +0000 |
| commit | 44bddf6cd2ebe636ef58855949128d37244f04a7 (patch) | |
| tree | 31552f37f666f53680123d06cd2eac98cbd029eb /src/components/conversation/conversation.vue | |
| parent | 7f3fd9ca21b1365f3cc6222c18fe700660dd5881 (diff) | |
| parent | 6acf812101f79b450dc4efd2da051c634dd18621 (diff) | |
Merge branch 'fix/usercard-use-general-roles' into 'develop'
User card: use general.role instead of card-specific roles
See merge request pleroma/pleroma-fe!1344
Diffstat (limited to 'src/components/conversation/conversation.vue')
0 files changed, 0 insertions, 0 deletions