diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-01 10:40:33 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-01 10:40:33 +0000 |
| commit | 133294dc2aa56927097e7641dec7f15ad9179d80 (patch) | |
| tree | f8a260c28b2a9df3fac36b229085f3d53abd01e7 /src/components/attachment/attachment.vue | |
| parent | 397622078fa313f710d61292212d4f53e7bc6527 (diff) | |
| parent | e98e285f50ba54003ad12db7ac2c00ea109efd82 (diff) | |
Merge branch 'feat/add-missing-emoji-and-script' into 'develop'
Update emoji.json, add script that merges new emoji from another source
See merge request pleroma/pleroma-fe!1295
Diffstat (limited to 'src/components/attachment/attachment.vue')
0 files changed, 0 insertions, 0 deletions