hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases

Browse source
This commit is contained in:
lain 2021-01-05 12:42:30 +01:00
commit f0e6cff583
18 changed files with 246 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/API/admin_api.md
View file

@ -1123,6 +1123,7 @@ Loads json generated from `config/descriptions.exs`.
```json
[
{
"id": 1234,
"data": {
"actor": {
"id": 1,