# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex

Update Mastodon Frontend to 2019-02-10 bundle

See merge request pleroma/pleroma!806

Add Feather to the clients list

See merge request pleroma/pleroma!804

Fix credo issues

See merge request pleroma/pleroma!786

Update service files of OpenRC and systemd to new recommended paths

See merge request pleroma/pleroma!798

See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]

Recommend the acme-challenge path that is used in the installation guides

See merge request pleroma/pleroma!803

docs/Clients.md: Add documentation about clients supporting pleroma

See merge request pleroma/pleroma!726

[ci skip]

[ci skip]

[ci skip]

helps differenciate between Electrons and others like Brutaldon.
[ci skip]

[ci skip]

Do object insertion through Cachex

See merge request pleroma/pleroma!802

Respect blocks in mass follow.

See merge request pleroma/pleroma!797

So we don't flood our postgres logs with errors. Should also make things
slightly faster.

Add /media to Caddy cache

See merge request pleroma/pleroma!791

Add keyword policy

See merge request pleroma/pleroma!794

Split hide_network only for local users

See merge request pleroma/pleroma!781