Ivan Tashkinov 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering ... # Conflicts: # lib/pleroma/thread_mute.ex		2020-03-26 09:43:58 +03:00
..
mix	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'	2020-03-11 15:16:18 +00:00
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-26 09:43:58 +03: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