diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-04-08 06:02:11 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-04-08 06:02:11 +0000 |
commit | 9998b4519da0a732d2a91ca067f4f849a0d37be6 (patch) | |
tree | f29460d280dad1d0e314b21b211c5717e575006c /installation/pleroma.nginx | |
parent | 9a2d3705c69ed4acd97d423013d29f8d5d608f94 (diff) | |
parent | 1857f403bea8d16f95a3b1ae46e07e2acd807c3c (diff) | |
download | pleroma-9998b4519da0a732d2a91ca067f4f849a0d37be6.tar.gz pleroma-9998b4519da0a732d2a91ca067f4f849a0d37be6.zip |
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions