Merge branch 'develop' into issue/1354
authorMark Felder <feld@FreeBSD.org>
Sun, 12 Jan 2020 18:12:15 +0000 (12:12 -0600)
committerMark Felder <feld@FreeBSD.org>
Sun, 12 Jan 2020 18:12:15 +0000 (12:12 -0600)
commit2f5b8fbeb3830759c00675f99d893a92b1d3edb2
treeee7ba90fa0b52e31cc7beeb9335deefbadd94e15
parent933dc120438d14502e4bc4c29db904114fb6e438
parentecb8fe183c5a007e80d7b2b1bfc9ead89dc27cc2
Merge branch 'develop' into issue/1354
lib/pleroma/web/activity_pub/publisher.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/web/twitter_api/util_controller_test.exs