diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-05 10:54:07 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-05 10:54:07 +0000 |
| commit | 45627dde17a4093775e770e83bffbfec4e1b6759 (patch) | |
| tree | 086ae0eb1732ec22cc1e7cd9dbd6bd015c59b833 /lib/pleroma/web/xml/xml.ex | |
| parent | d70d1c427a29411f2b47789f91894cd08f91ba6e (diff) | |
| parent | 033771d9f186012a066d8b42152a18076651171f (diff) | |
| download | pleroma-45627dde17a4093775e770e83bffbfec4e1b6759.tar.gz | |
Merge branch 'develop' into 'develop'
Fix failure to serve media from custom upload path
See merge request pleroma/pleroma!95
Diffstat (limited to 'lib/pleroma/web/xml/xml.ex')
0 files changed, 0 insertions, 0 deletions