akkoma/lib
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
..
mix Merge branch 'feature/1584-client-captcha-options' into 'develop' 2020-04-17 09:19:35 +00:00
pleroma Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks 2020-04-22 18:51:59 +03:00
jason_types.ex Update Copyrights 2020-03-03 16:44:49 -06:00
transports.ex Update Copyrights 2020-03-03 16:44:49 -06:00
xml_builder.ex Update Copyrights 2020-03-03 16:44:49 -06:00