diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-29 18:15:58 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-29 18:15:58 +0000 |
| commit | d94fdd0617057f17a677e7e409f65021afc9d124 (patch) | |
| tree | 3f9b0d96d1d76eedd59fd7de353be0ae668b796c /src/components/basic_user_card/basic_user_card.vue | |
| parent | 6d1d09bcc05f4476c7efad1980e656683db2e5c3 (diff) | |
| parent | a793835566d478503f4cadf7970ad62476dd75ac (diff) | |
Merge branch '220-import-export-blocks-mutes' into 'develop'
Allow import/export of blocks
See merge request pleroma/pleroma-fe!717
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
0 files changed, 0 insertions, 0 deletions