Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Fri, 10 Nov 2017 16:37:54 +0000 (17:37 +0100)
committerRoger Braun <roger@rogerbraun.net>
Fri, 10 Nov 2017 16:37:54 +0000 (17:37 +0100)
commit1d3d66a841253a244e5166726ba4f3d1f21651c3
treeb1d0c230d9bfebd139b527392e5399fa647781d9
parent6e9c22c0afaa67f0b94f602eceef5c57b7c9192f
parent1b8ad9f731708a3231ef01a5db1fba2516d48d98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
test/web/mastodon_api/mastodon_api_controller_test.exs