Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs		2019-08-22 20:59:58 +03:00
..
controllers	[#1149] Added more oban workers. Refactoring.	2019-08-13 20:20:26 +03:00
representers	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
views	Use info.fields instead of source_data for remote users	2019-08-14 14:52:54 +07:00
twitter_api.ex	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00
twitter_api_controller.ex	Fix password reset for non-test env	2019-07-17 18:09:31 +00:00