diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-10 03:14:51 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-10 03:14:51 +0000 |
| commit | 25601c6873a17a9a91d1134f4a145b320e78fd7b (patch) | |
| tree | 931d4b51b442a539f327ec89b3eb89e06e755ef9 /src/services/api/api.service.js | |
| parent | d7cf841dfe6e434b27afed32ef2fcf214c5b6bc4 (diff) | |
| parent | a25aabfa10b64bb2398c6f927d295aef1a7742b6 (diff) | |
Merge branch 'fix-emoji-picker' into 'develop'
support new custom emoji format
Closes #484
See merge request pleroma/pleroma-fe!746
Diffstat (limited to 'src/services/api/api.service.js')
0 files changed, 0 insertions, 0 deletions