Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

.credo.exs

TODO.txt

config/config.exs

config/test.exs

lib/pleroma/activity.ex

lib/pleroma/application.ex

lib/pleroma/object.ex

lib/pleroma/plugs/authentication_plug.ex

lib/pleroma/upload.ex

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/federator/federator.ex

lib/pleroma/web/ostatus/activity_representer.ex

lib/pleroma/web/ostatus/feed_representer.ex

lib/pleroma/web/ostatus/ostatus.ex

lib/pleroma/web/ostatus/ostatus_controller.ex

lib/pleroma/web/ostatus/user_representer.ex

lib/pleroma/web/router.ex

lib/pleroma/web/salmon/salmon.ex

...roma/web/twitter_api/representers/activity_representer.ex