git.squeep.com Git - akkoma/commit

author	floatingghost <hannah@coffee-and-dreams.uk>
	Tue, 2 Aug 2022 14:19:24 +0000 (14:19 +0000)
committer	floatingghost <hannah@coffee-and-dreams.uk>
	Tue, 2 Aug 2022 14:19:24 +0000 (14:19 +0000)
commit	ca000f8301a1ed08fbc6cdb3712b82c4cdb4b78c
tree	101829d2f7b2c87322e814b0f833162f0be111f1	tree \| snapshot
parent	e26388a01c91f9e3b1b9a0b77938b6f5b215ec63	commit \| diff

Merge mrf_simple-reject with quarantine (#137)

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/137

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

CHANGELOG.md		diff \| blob \| history
config/config.exs		diff \| blob \| history
config/description.exs		diff \| blob \| history
docs/docs/configuration/cheatsheet.md		diff \| blob \| history
lib/pleroma/config/deprecation_warnings.ex		diff \| blob \| history
lib/pleroma/web/activity_pub/publisher.ex		diff \| blob \| history
test/pleroma/web/activity_pub/publisher_test.exs		diff \| blob \| history