sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-11-18 07:36:28 +01:00
Code Issues Releases Wiki Activity
908cf22a6c
pleroma/lib
History
Ivan Tashkinov 908cf22a6c 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-28 19:56:20 +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-28 19:56:20 +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