akkoma/docs
Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
..
administration Merge branch 'feature/1584-client-captcha-options' into 'develop' 2020-04-17 09:19:35 +00:00
API Merge branch 'feature/1584-client-captcha-options' into 'develop' 2020-04-17 09:19:35 +00:00
configuration Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
installation Merge branch 'docs/debian-packages' into 'develop' 2020-04-22 12:10:27 +00:00
clients.md [#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest. 2020-03-02 21:43:18 +03:00
dev.md Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. 2020-04-22 18:50:25 +03:00
introduction.md [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00