git.squeep.com Git - akkoma/commit

author	kaniini <ariadne@dereferenced.org>
	Mon, 30 Sep 2019 11:21:49 +0000 (11:21 +0000)
committer	kaniini <ariadne@dereferenced.org>
	Mon, 30 Sep 2019 11:21:49 +0000 (11:21 +0000)
commit	26f66fb70ab1bd777a92daf4347aaa63b044d0af
tree	75d562e8e5d9f6a036d626e0cb9d081998242263	tree \| snapshot
parent	0e356cc8003665ec05a42e39b3a5c47e31ec384c	commit \| diff
parent	0dc8f3d6d2fa18261e9a6fa8da540c434f1fa67b	commit \| diff

Merge branch 'features/apc2s-media-upload' into 'develop'

AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706

Fork of https://akkoma.dev/AkkomaGang/akkoma.git

lib/pleroma/web/activity_pub/activity_pub_controller.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/views/user_view.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	diff1 \|	diff2 \|	blob \| history
priv/static/schemas/litepub-0.1.jsonld	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_controller_test.exs	diff1 \|	diff2 \|	blob \| history
test/web/ostatus/ostatus_controller_test.exs	diff1 \|	diff2 \|	blob \| history