kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' ... # Conflicts: # lib/pleroma/web/activity_pub/utils.ex		2018-08-26 21:06:15 +00:00
..
mrf	lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format	2018-06-23 16:12:57 +02:00
views	Merge branch 'develop' into 'feature/relay'	2018-08-26 21:06:15 +00:00
activity_pub.ex	Merge branch 'develop' into 'feature/relay'	2018-08-26 21:06:15 +00:00
activity_pub_controller.ex	activitypub: refactor relay concerns into new relay module	2018-08-06 08:22:10 +00:00
mrf.ex	format & made get_policies/1 private	2018-05-10 18:51:58 +02:00
relay.ex	relay: only relay create activities	2018-08-06 08:22:16 +00:00
transmogrifier.ex	transmogrifier: reject activities lacking a valid ID	2018-08-23 01:25:26 +00:00
utils.ex	Merge branch 'develop' into 'feature/relay'	2018-08-26 21:06:15 +00:00