Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
|
|
twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
|
|
|
twitter_oauth
# Conflicts:
# mix.exs
|
|
|
|
|
|
|
|
|
|
twitter_oauth
# Conflicts:
# mix.exs
|
|
|
|
|
|
|
|
|
|
|
|
kms
|
|
|
|
|
|
|
|
|
|
|
|
|
|
format for `scopes` fields, updated usages.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
This reverts merge request !480
|
|
|
|
|
|
|
|
This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing
changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
|
|
|
|
This reverts merge request !309
|
|
plain text
|
|
|
|
|