Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2...
authorIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
committerIvan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
commitaac48d0cc6893c231c88d5cd7fe0334353bbf299
treec3e423993ff5289dd0ba73a94881bd52d9cda1c2
parentf6fab01ba7a08fe0e5147f82d9e3dd294922dc93
parentf8aa917eef9280631a5cd2c95cf1db8fab6e14e5
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs