lain d15aa9d950 Merge branch 'develop' into 'remove-twitter-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex		2020-05-16 17:07:09 +00:00
..
mix	Fix digest mix task on OTP releases	2020-05-13 13:34:03 +02:00
pleroma	Merge branch 'develop' into 'remove-twitter-api'	2020-05-16 17:07:09 +00: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