diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
| commit | f00ff20768cbbb6eb5a6442772335dbe60fde6d4 (patch) | |
| tree | 934dba7fb5aa850a3a35b229bd7c6020ca3b2816 /docs/API/admin_api.md | |
| parent | c556efb761a3e7fc2beb4540d6f58dbfe8e4abfe (diff) | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| download | pleroma-f00ff20768cbbb6eb5a6442772335dbe60fde6d4.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/following_relationship.ex
Diffstat (limited to 'docs/API/admin_api.md')
0 files changed, 0 insertions, 0 deletions