Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 7 Jan 2019 13:55:32 +0000 (20:55 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 7 Jan 2019 13:55:32 +0000 (20:55 +0700)
commitf24087f96ed31a18ed73b6e2d2c7b3a6ec1e6df6
tree0f45822223ce9973162829e8bf6b4c47eec67562
parent380e9fba21123467b41629828f97d5f2c257a128
parentb640cf0ce09f2c3f81ad8f74a4a536be34605c49
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs