Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)
commit3126f8a334e4f0aeb6aad59e22c8f8c1ac9ec668
treeda0c76c39a7b09b5ee01aad9f4e28fa001a1c713
parentd589f3dcfb961fa92bac8c8d140000de498353ff
parent5a3a5abc0c3315cba1ed3694e8a2876da8a5d294
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'

Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md