summaryrefslogtreecommitdiff
path: root/test/web/admin_api/controllers/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-07-13 15:43:46 +0000
committerfeld <feld@feld.me>2020-07-13 15:43:46 +0000
commit8f9ee694ed47709231ffc852d2e82a06468cba06 (patch)
treee630406cab99481af192bbe3108ded6d460d5147 /test/web/admin_api/controllers/admin_api_controller_test.exs
parent63fef0c0fb8e8d95b441d50e8dac3ef2c782a84f (diff)
parentcc7153cd828afef1564b58649875b5529c078054 (diff)
downloadpleroma-8f9ee694ed47709231ffc852d2e82a06468cba06.tar.gz
pleroma-8f9ee694ed47709231ffc852d2e82a06468cba06.zip
Merge branch 'features/profile-fields-emojo' into 'develop'
user: Add support for custom emojis in profile fields See merge request pleroma/pleroma!2741
Diffstat (limited to 'test/web/admin_api/controllers/admin_api_controller_test.exs')
0 files changed, 0 insertions, 0 deletions