Merge remote-tracking branch 'MAIN/develop' into feature/jobs
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 31 Jan 2019 08:07:49 +0000 (15:07 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 31 Jan 2019 08:07:49 +0000 (15:07 +0700)
commitd3677d2b4d4d53619777509e0169bb0764213d39
treec93f81bd476ba1feee727dd16d72593968aa3648
parentab31adf15bbec1597a9b7cf065898fb3f712eef3
parent95d6118090fbd36fca4fd62133b270eaf27ae4df
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
config/config.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/ostatus/ostatus_controller.ex