Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Mon, 30 Sep 2019 11:57:54 +0000 (13:57 +0200)
committerlain <lain@soykaf.club>
Mon, 30 Sep 2019 11:57:54 +0000 (13:57 +0200)
commitb923842e96e821afeb7bbfa0d098b9c5698281c5
tree37d84255d7b97fc411f5c78378565a8f205a2120
parent6fe2f554c36be1ef03ac1d1104a78d0686f48a26
parent74d8fadf3745a4b4203c2cead35b741554ccc439
Merge remote-tracking branch 'origin/develop' into reactions
13 files changed:
docs/api/pleroma_api.md
lib/pleroma/constants.ex
lib/pleroma/emoji.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
lib/pleroma/web/router.ex
test/emoji_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs