feld 53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc' ... # Conflicts: # docs/configuration/mrf.md		2020-02-18 20:58:15 +00:00
..
administration	DOCS Backup/Restore/Migrate your instance	2020-02-10 23:53:26 +00:00
API	Merge branch 'need-reboot-flag' into 'develop'	2020-02-18 14:32:03 +00:00
configuration	Merge branch 'develop' into 'fix/mrf-sample-doc'	2020-02-18 20:58:15 +00: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