Merge branch 'develop' into 'develop'
authorhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 19:18:46 +0000 (19:18 +0000)
committerhref <href+git-pleroma@random.sh>
Fri, 1 Feb 2019 19:18:46 +0000 (19:18 +0000)
commit7e384a2425b5188ca76aad4b97172b553ca9b640
tree6f62be07ca95741fca15a95119b13ae3361bb95c
parent389e6a878a7636c29f57cb4603abd33f4cca98d9
parent9cac8729afa7219d8b87e2851b855cab7a1c04b3
Merge branch 'develop' into 'develop'

Use nodeinfo 2.1

See merge request pleroma/pleroma!753