lain ab1154e13f Merge branch 'admin-logo-upload' into 'develop' ... Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388		2020-05-21 14:30:34 +00:00
..
mix	Merge branch 'issue/749' into 'develop'	2020-05-21 13:27:44 +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