diff options
author | href <href+git-pleroma@random.sh> | 2019-02-01 19:18:46 +0000 |
---|---|---|
committer | href <href+git-pleroma@random.sh> | 2019-02-01 19:18:46 +0000 |
commit | 7e384a2425b5188ca76aad4b97172b553ca9b640 (patch) | |
tree | 6f62be07ca95741fca15a95119b13ae3361bb95c /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 389e6a878a7636c29f57cb4603abd33f4cca98d9 (diff) | |
parent | 9cac8729afa7219d8b87e2851b855cab7a1c04b3 (diff) | |
download | pleroma-7e384a2425b5188ca76aad4b97172b553ca9b640.tar.gz |
Merge branch 'develop' into 'develop'
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions