Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats

lib/pleroma/web/ostatus/feed_representer.ex

lib/pleroma/web/salmon/salmon.ex

test/fixtures/salmon.xml

test/web/salmon/salmon_test.exs