pleroma/priv
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
..
gettext Add Russian translation 2019-07-10 18:10:09 +07:00
repo [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-22 20:59:58 +03:00
static Update AdminFE 2019-08-12 15:00:03 -05:00
templates merge develop 2019-07-12 18:08:27 +03:00