Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 13 May 2019 18:35:45 +0000 (18:35 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 13 May 2019 18:35:45 +0000 (18:35 +0000)
commitf3e8f5b1f208b10130c7123e68af1e38575f180b
tree523d1f1cfa399f4ee6d841ba3098ecd87d8e67e7
parent5a4d55cf910f85b07f111972647a8b4410b5eb6b
parenta2be420f940fb8f181feeb9b0fb9759d433dcae1
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'

Features/mastoapi/2.7.0 registration

Closes #773

See merge request pleroma/pleroma!1134