Age | Commit message (Collapse) | Author |
|
1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
|
|
|
|
|
|
|
branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
|
|
|
|
|
|
|
|
|
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private statuses)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This is to avoid 500 error when the reported user no longer exists
in the database.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
we can't change module attributes and endpoint settings in runtime
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge conflict in lib/pleroma/activity.ex
|
|
|
|
|
|
|
|
|
|
|