rinpatch 65db5e9f52 Resolve merge conflicts

2019-06-01 16:29:58 +03:00

..

mrf

mrf: simple policy: fix matching imported activitypub and ostatus statuses

2019-05-26 02:01:24 +00:00

views

move key generation functions into Pleroma.Keys module

2019-05-22 03:58:15 +00:00

activity_pub_controller.ex

Use Pleroma.Config everywhere

2019-05-30 15:33:58 +07:00

activity_pub.ex

Resolve merge conflicts

2019-06-01 16:29:58 +03:00

mrf.ex

Use Pleroma.Config everywhere

2019-05-30 15:33:58 +07:00

publisher.ex

kill @httpoison

2019-05-25 04:24:21 +00:00

relay.ex

Merging with develop

2019-05-01 12:29:33 +07:00

transmogrifier.ex

Resolve merge conflicts

2019-06-01 16:29:58 +03:00

utils.ex

Add poll votes

2019-06-01 16:17:46 +03:00

visibility.ex

Merge branch 'develop' into conversations-import

2019-05-16 13:11:17 -05:00