Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 15 Jun 2020 12:03:40 +0000 (16:03 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 15 Jun 2020 12:03:40 +0000 (16:03 +0400)
commit58e4e3db8b04933129303d0ad9da74b43cbb4003
tree28cc28e116b8a8091e686ebc7a17f3c783d7ad04
parent09d31d24de568aac06fe203beeb8bb2a9de8f602
parent448e93ce2c1eab9eb91118b90f661c31056e4781
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
CHANGELOG.md
config/description.exs
lib/pleroma/web/rich_media/parser.ex
lib/pleroma/web/rich_media/parsers/meta_tags_parser.ex
lib/pleroma/web/rich_media/parsers/oembed_parser.ex