minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay' ... # Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex		2020-06-04 13:29:32 +00:00
..
mix	Merge branch 'mix/database-vacuum-options' into 'develop'	2020-05-29 15:33:35 +00:00
pleroma	Merge branch 'develop' into 'openapi/admin/relay'	2020-06-04 13:29:32 +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