Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex		2019-02-04 20:50:28 +07:00
..
Admin-API.md	Add docs/Admin-API.md	2018-12-31 12:27:46 +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-04 20:50:28 +07:00