Mark Felder 589bffa57d Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc		2020-02-14 11:06:04 -06:00
..
administration	DOCS Backup/Restore/Migrate your instance	2020-02-10 23:53:26 +00:00
API	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
configuration	Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc	2020-02-14 11:06:04 -06:00
installation	Updated OpenBSD installation guide for version OpenBSD 6.6	2020-01-22 17:33:10 -05:00
clients.md	clients.md: Add Kyclos	2020-02-11 02:27:40 +01:00
introduction.md	DOCS General update for the "Introduction to Pleroma" section	2020-01-28 12:57:06 +00:00