diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-02 19:38:39 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-02 19:38:39 +0300 |
| commit | 3fa51f72728255fbe287bb307ab38d563e5611b4 (patch) | |
| tree | 89da8c8cd8ef5db3c8be2a769cb6273b0bba27d7 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | 98b96e45ababecb7554232787968f2f326f24e54 (diff) | |
| parent | aa78325117c879ecb7ec76383c239078275adbd9 (diff) | |
| download | pleroma-3fa51f72728255fbe287bb307ab38d563e5611b4.tar.gz | |
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
0 files changed, 0 insertions, 0 deletions