Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
|
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
|
|
|
|
|
|
validate-user-info
|
|
|
|
|
|
|
|
is https
This fixes running mastofe with MIX_ENV=dev
|
|
|
|
|
|
admin.”
|
|
fix error reporting
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and replacing the digest header
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|