diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-26 09:50:54 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-26 09:50:54 +0000 |
| commit | e1fe46e1cfccb7971032ecfa04426413f0c00ac6 (patch) | |
| tree | 7b8ed19a65cc2250a7f88ff36e7ee533e5c4907e /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | 5d6d86bf00fa533d505ffe5fc3df6c3eadae5739 (diff) | |
| parent | 1c926c7b60b999311d01266bb65187e1be5adc1e (diff) | |
| download | pleroma-e1fe46e1cfccb7971032ecfa04426413f0c00ac6.tar.gz | |
Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'
activitypub: allow mastodon S2S block extension support to be disabled
See merge request pleroma/pleroma!176
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
0 files changed, 0 insertions, 0 deletions