Age | Commit message (Collapse) | Author |
|
# Conflicts:
# config/config.exs
# docs/config.md
|
|
settings refactoring.
|
|
|
|
|
|
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
|
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
changes in apis
|