diff options
| author | feld <feld@feld.me> | 2019-07-09 16:00:44 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-07-09 16:00:44 +0000 |
| commit | 167f810ff18fdc0271e6908d1d07c2f715e3f34f (patch) | |
| tree | cd72722e65290afa25a5292bdbf8be88da332c8c /test/web/mastodon_api/controllers | |
| parent | 95c085174dc523f2898f02120d7ff0b120930d91 (diff) | |
| parent | e143747445a0cd4f9b34c1b96ab7e87632e21a74 (diff) | |
| download | pleroma-167f810ff18fdc0271e6908d1d07c2f715e3f34f.tar.gz pleroma-167f810ff18fdc0271e6908d1d07c2f715e3f34f.zip | |
Merge branch 'proxy-error' into 'develop'
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
Diffstat (limited to 'test/web/mastodon_api/controllers')
0 files changed, 0 insertions, 0 deletions