lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060		2019-12-12 18:43:21 +00:00
..
mix	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
pleroma	Merge branch 'feature/native-captcha' into 'develop'	2019-12-12 18:43:21 +00:00
jason_types.ex
transports.ex
xml_builder.ex