Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorRoger Braun <roger@rogerbraun.net>
Sun, 12 Nov 2017 13:23:39 +0000 (14:23 +0100)
committerRoger Braun <roger@rogerbraun.net>
Sun, 12 Nov 2017 13:25:15 +0000 (14:25 +0100)
commit5fc6e9d467f69af155627cccaa27616fe7ffc61f
treef9f5cf0d8c93d22eeb232fb3579d84d1c732ef71
parentd293ceb1b535ab749fa841e18c1fa2ee63972afb
parent08bc31674218cd7ce634b008b7766b48e49c52e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex