diff options
author | lambadalambda <gitgud@rogerbraun.net> | 2017-10-20 10:35:03 -0400 |
---|---|---|
committer | lambadalambda <gitgud@rogerbraun.net> | 2017-10-20 10:35:03 -0400 |
commit | d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349 (patch) | |
tree | cdefa4c3313b03c01fb960c49b8bbce1e7b33450 /lib/xml_builder.ex | |
parent | 38f3908c14d3b8fcfe522d4c92bde022dcc682e3 (diff) | |
parent | fe7804e42d27ca46290cfe52ffc01d4e520849b5 (diff) | |
download | pleroma-d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349.tar.gz pleroma-d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349.zip |
Merge branch 'develop' into 'develop'
Add an API endpoint for emoji.
See merge request lambadalambda/pleroma!28
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions