Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 8 Sep 2019 05:41:10 +0000 (08:41 +0300)
commitc3f00447afc67b460e63b531e4f2432bfaa37bdb
treeb287a12222c282f7ec4406b6e4d5e513e81180c9
parentca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e
parentc45013df8e53334bcc1afb8cd1df673c290037ee
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex