Ivan Tashkinov 1838f739d1 Merge remote-tracking branch 'remotes/origin/develop' into oauth-form ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/templates/layout/app.html.eex		2020-10-29 19:21:27 +03:00
..
administration
API
configuration	Merge remote-tracking branch 'remotes/origin/develop' into oauth-form	2020-10-29 19:21:27 +03:00
installation
ap_extensions.md
clients.md
dev.md
index.md