diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-23 23:59:06 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-23 23:59:06 +0000 |
| commit | 2ae510ee819e86c7841917a85e2adbb7183fe8e4 (patch) | |
| tree | 44a60063b1e66c78e69e4e5591f018487e5b8a5f /lib/pleroma/web/router.ex | |
| parent | 1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff) | |
| parent | d3bdb8e7049ebda19593d064b308b40ddb6ab4d1 (diff) | |
| download | pleroma-2ae510ee819e86c7841917a85e2adbb7183fe8e4.tar.gz | |
Merge branch 'bugfix/rich-media-splice-url' into 'develop'
rich media: parser: splice the given URL into the result
See merge request pleroma/pleroma!1480
Diffstat (limited to 'lib/pleroma/web/router.ex')
0 files changed, 0 insertions, 0 deletions