Alex S bdfa3a6fa8 Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex		2019-05-01 12:29:33 +07:00
..
mrf	mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil	2019-03-24 15:47:50 +01:00
views	AP UserView: Refactor banner / avatar display code, add test.	2019-03-26 16:59:28 +01:00
activity_pub.ex	Do not normalize objects in stream_out unless the activity type is	2019-04-30 20:21:28 +03:00
activity_pub_controller.ex	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
mrf.ex	[Credo] Remove parentesis on argument-less functions	2019-03-13 04:26:56 +01:00
relay.ex	Merging with develop	2019-05-01 12:29:33 +07:00
transmogrifier.ex	Merging with develop	2019-05-01 12:29:33 +07:00
utils.ex	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
visibility.ex	Fix object search depending on embeded object	2019-04-18 09:28:20 +03:00