[#468] Merged `upstream/develop`.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 19 Feb 2019 16:10:55 +0000 (19:10 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 19 Feb 2019 16:10:55 +0000 (19:10 +0300)
commitc0ecbf6669948740a091bdf5b5441fb6ee55f4fc
tree9ad9fadc6855b1529df7ce8403683c32f776265b
parentd3fe2c8ec6116fbc3058f7a795ef59564bddfb08
parent1dd718e83c76db218f12a98344b568fe10ecbefe
[#468] Merged `upstream/develop`.
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth/token.ex
lib/pleroma/web/router.ex
test/support/factory.ex