[#468] Merged `upstream/develop`, resolved conflicts.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)
commitbc4f77b10bb4360ac00d1999b1d08fa55e1fa547
tree8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485
parentdcf24a3233bb50689d26f9d7833f98158730ce35
parent3b141194715e362d65482672d00b10991d102fa2
[#468] Merged `upstream/develop`, resolved conflicts.
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth/app.ex
lib/pleroma/web/oauth/authorization.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/oauth/token.ex
lib/pleroma/web/router.ex
lib/pleroma/web/templates/layout/app.html.eex
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
test/web/oauth/authorization_test.exs
test/web/oauth/oauth_controller_test.exs
test/web/oauth/token_test.exs