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
..
token	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 20:59:58 +03:00
app.ex	differences_in_mastoapi_responses.md: fullname & bio are optionnal	2019-05-13 18:35:45 +00:00
authorization.ex	[#184] small refactoring reset password	2019-06-24 19:01:56 +00:00
fallback_controller.ex	Wrap error messages into gettext helpers	2019-07-10 18:10:09 +07:00
oauth_controller.ex	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00
oauth_view.ex	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
scopes.ex	Refactoring functions for dealing with oauth scopes.	2019-05-08 10:52:13 +00:00
token.ex	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00