Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex		2019-02-11 13:54:21 +07:00
..
Admin-API.md	Add docs/Admin-API.md	2018-12-31 12:27:46 +01:00
Clients.md	add feather to webclients	2019-02-10 16:18:04 +01:00
Pleroma-API.md	docs/Pleroma-API.md: Add missing token field documentation	2019-01-31 23:23:53 +01:00
config.md	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-11 13:54:21 +07:00