feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs		2020-02-13 14:37:55 +00:00
..
mix	Fix email mix task on OTP releases	2020-02-09 03:27:29 +03:00
pleroma	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'	2020-02-13 14:37:55 +00:00
jason_types.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
transports.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00
xml_builder.ex	Add license/copyright to all project files	2019-07-10 05:13:23 +00:00