Merge branch 'develop' into feature/database-compaction
authorrinpatch <rinpatch@sdf.org>
Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 18 Apr 2019 09:56:38 +0000 (12:56 +0300)
commit83589ca6a56ed4ff6d7e9a116fbbf1797ba50e39
tree48f28e164bdb18687fd9d6d52b39b996da889468
parentac04311b3f0a611b5008747037d6cd5874fa3ae9
parent8c65b69d4a536311347a27f85198d2883fcd03b8
Merge branch 'develop' into feature/database-compaction
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs