-
- Downloads
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts: # mix.exs
Showing
- AGPL-3 0 additions, 0 deletionsAGPL-3
- CC-BY-NC-ND-4.0 403 additions, 0 deletionsCC-BY-NC-ND-4.0
- CC-BY-SA-4.0 427 additions, 0 deletionsCC-BY-SA-4.0
- COPYING 48 additions, 0 deletionsCOPYING
- config/config.exs 5 additions, 0 deletionsconfig/config.exs
- docs/api/differences_in_mastoapi_responses.md 6 additions, 0 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/config.md 19 additions, 1 deletiondocs/config.md
- lib/mix/tasks/pleroma/instance.ex 34 additions, 0 deletionslib/mix/tasks/pleroma/instance.ex
- lib/mix/tasks/pleroma/robots_txt.eex 2 additions, 0 deletionslib/mix/tasks/pleroma/robots_txt.eex
- lib/mix/tasks/pleroma/user.ex 16 additions, 0 deletionslib/mix/tasks/pleroma/user.ex
- lib/pleroma/html.ex 15 additions, 2 deletionslib/pleroma/html.ex
- lib/pleroma/object.ex 5 additions, 0 deletionslib/pleroma/object.ex
- lib/pleroma/plugs/user_fetcher_plug.ex 2 additions, 20 deletionslib/pleroma/plugs/user_fetcher_plug.ex
- lib/pleroma/user.ex 15 additions, 16 deletionslib/pleroma/user.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 27 additions, 8 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/utils.ex 39 additions, 16 deletionslib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/common_api/common_api.ex 10 additions, 7 deletionslib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/common_api/utils.ex 10 additions, 2 deletionslib/pleroma/web/common_api/utils.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 3 additions, 2 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/twitter_api/controllers/util_controller.ex 33 additions, 16 deletionslib/pleroma/web/twitter_api/controllers/util_controller.ex
Loading
Please register or sign in to comment