diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
| commit | 65db5e9f528a3f8d8b3c81953fd160a6744dfffd (patch) | |
| tree | 9da5234f8a9dd411b59e839eeb38254822939e2f /test/web/rich_media/parser_test.exs | |
| parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
| parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
| download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.zip | |
Resolve merge conflicts
Diffstat (limited to 'test/web/rich_media/parser_test.exs')
| -rw-r--r-- | test/web/rich_media/parser_test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/rich_media/parser_test.exs b/test/web/rich_media/parser_test.exs index 47b127cf9..3a9cc1854 100644 --- a/test/web/rich_media/parser_test.exs +++ b/test/web/rich_media/parser_test.exs @@ -44,6 +44,8 @@ defmodule Pleroma.Web.RichMedia.ParserTest do %{ image: "http://ia.media-imdb.com/images/rock.jpg", title: "The Rock", + description: + "Directed by Michael Bay. With Sean Connery, Nicolas Cage, Ed Harris, John Spencer.", type: "video.movie", url: "http://www.imdb.com/title/tt0117500/" }} |