Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-02 20:42:40 +03:00
..
mrf	[#1149] Refactored Oban workers API (introduced enqueue/3).	2019-08-31 21:58:42 +03:00
views	Merge branch 'features/apc2s-media-upload' into 'develop'	2019-09-30 11:21:49 +00:00
activity_pub.ex	pleroma api: hook up scrobbler controller	2019-09-30 10:39:17 +00:00
activity_pub_controller.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +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	Do not return tuple when unneeded	2019-09-24 15:03:20 +07:00
relay.ex	update tests	2019-08-24 17:41:53 +03:00
transmogrifier.ex	activitypub: transmogrifier: implement support for Listen activities	2019-09-30 10:39:17 +00:00
utils.ex	activitypub: implement IR-level considerations for Listen activities	2019-09-30 10:39:17 +00:00
visibility.ex	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00