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
..
admin_email.ex	Remove Reply-To from report emails	2019-08-04 22:24:50 +00:00
mailer.ex	[#1149] Oban mailer job. Adjusted tests.	2019-08-14 21:42:21 +03:00
user_email.ex	Add configurable colors and logo for the digest template	2019-08-16 18:32:25 +07:00