diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-02 07:02:24 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-02 07:02:24 +0000 |
| commit | 9b38bf4af47f65ecef92ef69f0a5541e4b21902d (patch) | |
| tree | aa65160c9d3627ffe6d1f021dba41c573692f823 /lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | |
| parent | 5eab6561d87f43e8f2f5e4afc93808ece8ead84c (diff) | |
| parent | 427d0c2a007db6c8424c64a8f3504420e5203bef (diff) | |
| download | pleroma-9b38bf4af47f65ecef92ef69f0a5541e4b21902d.tar.gz | |
Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex')
0 files changed, 0 insertions, 0 deletions