aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-02 12:47:40 +0000
committerlambda <lain@soykaf.club>2019-04-02 12:47:40 +0000
commit180b87257cae481d4d9ffc9f03a06268ad8df569 (patch)
treee74667283a46a4b2aa30657e4ef98537b54681f9 /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parentce9284b36f20a7116289ce1a14aa96e31e294093 (diff)
parentf20e8d28de97e154ec43120cb4fc07e2792e955a (diff)
downloadpleroma-180b87257cae481d4d9ffc9f03a06268ad8df569.tar.gz
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions