git.squeep.com Git - akkoma/commit

projects / akkoma / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 58e250d 89762ad)

author	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 4 Feb 2019 13:50:28 +0000 (20:50 +0700)
committer	Egor Kislitsyn <egor@kislitsyn.com>
	Mon, 4 Feb 2019 13:50:28 +0000 (20:50 +0700)
commit	3a3a3996b7a37d281745586fa40bbabd5299a1ce
tree	843d5295c820fef6d5112677dd1145b3757ad2ac	tree \| snapshot
parent	58e250d9d27205116df5634d909ec1e43ea55286	commit \| diff
parent	89762ad23034668f7440c9fb238dcf270e8c2e59	commit \| diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex

13 files changed:

config/config.exs	diff1 \|	diff2 \|	blob \| history
config/test.exs	diff1 \|	diff2 \|	blob \| history
docs/config.md	diff1 \|	diff2 \|	blob \| history
lib/pleroma/application.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub_controller.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/utils.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/federator/federator.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/ostatus/ostatus_controller.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/salmon/salmon.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/websub/websub.ex	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/websub/websub_controller.ex	diff1 \|	diff2 \|	blob \| history
test/web/federator_test.exs	diff1 \|	diff2 \|	blob \| history

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