Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex		2019-12-04 18:56:31 +03:00
..
mrf	object age policy: remove debug logging	2019-11-14 19:56:14 -06:00
views	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-21 11:05:09 +03:00
activity_pub.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-12-04 18:56:31 +03:00
activity_pub_controller.ex	ActivityPub controller: do not render remote users	2019-11-25 17:19:33 +03:00
internal_fetch_actor.ex	activitypub: introduce internal fetch service actor	2019-07-17 17:14:08 +00:00
mrf.ex	fix credo	2019-08-13 22:36:24 +00:00
publisher.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
relay.ex	excluded invisible actors from gets /api/v1/accounts/:id	2019-11-04 20:44:24 +03:00
transmogrifier.ex	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
utils.ex	Admin API: Error when trying to update reports in the "old" format	2019-11-16 18:44:48 +09:00
visibility.ex	Handle "Move" activity	2019-10-30 18:21:49 +07:00