diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-06 04:29:30 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-06 04:29:30 +0000 |
| commit | 2d333f99e8d36c56e62db3e13428610df0b3874c (patch) | |
| tree | dc170222e58c0929bbfe0a8e239131ec05568fa0 /src/components/user_card_content/user_card_content.vue | |
| parent | 68e53602299823067f696c8f0bdcfcd3fc4339d7 (diff) | |
| parent | 37c7d850f1f93b5aaeeba3d4770c40dcd648a540 (diff) | |
Merge branch 'patch-1' into 'develop'
Update es.json
See merge request pleroma/pleroma-fe!535
Diffstat (limited to 'src/components/user_card_content/user_card_content.vue')
0 files changed, 0 insertions, 0 deletions