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
api	Conversation: Add endpoint to get a conversation by id.	2019-08-12 13:58:04 +02:00
config	Fix some typos and rework a few lines in howto_mediaproxy.md	2019-08-04 03:12:38 +00:00
installation	Update otp_en.md - Added creation of initial admin user	2019-07-17 22:35:16 +00:00
clients.md	Fix domain for the contact clients.md	2019-07-19 08:40:47 +00:00
config.md	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 20:59:58 +03:00
introduction.md