Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 5 Nov 2017 11:12:19 +0000 (12:12 +0100)
committerRoger Braun <roger@rogerbraun.net>
Sun, 5 Nov 2017 11:12:19 +0000 (12:12 +0100)
commit7252f6b054dfdfac1f9bac77c442c5a1ebd898af
tree4cc9941c82ed2b2151b3ef2518dfe440c5c17fe5
parent046bee34d3b19c046dba59c1d6cb08548f978859
parentfa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs