lain e0d1a942a6 Merge branch 'issue/1707' into 'develop' ... [#1707] fixed `mix pleroma.instance gen` See merge request pleroma/pleroma!2565		2020-05-21 14:32:49 +00:00
..
mix	Merge branch 'issue/1707' into 'develop'	2020-05-21 14:32:49 +00:00
pleroma	Merge branch 'admin-logo-upload' into 'develop'	2020-05-21 14:30:34 +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