Alex Gleason 1438fd9583 Merge remote-tracking branch 'upstream/develop' into block-behavior		2021-01-06 15:22:35 -06:00
..
API	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	2021-01-05 12:42:30 +01:00
administration	Revert "Merge branch 'features/hashtag-column' into 'develop'"	2020-12-28 12:02:16 +00:00
configuration	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-01-06 15:22:35 -06:00
installation	Debian installation guide: fix libmagic header package name	2020-11-17 16:11:37 +03:00
ap_extensions.md	docs/ap_extensions.md: Add JSON-LD full names	2020-10-05 17:36:12 +02:00
clients.md	clients.md: Add AndStatus, note supported protocols	2020-10-26 03:23:47 +01:00
dev.md	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	2020-11-21 19:47:46 +03:00
index.md	Removed a space that was too much	2020-06-22 14:22:23 +02:00