Merge pull request #8142 from nupplaphil/task/di_config

author Hypolite Petovan <hypolite@mrpetovan.com>

Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)

committer GitHub <noreply@github.com>

Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)
author Hypolite Petovan <hypolite@mrpetovan.com>
Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)
committer GitHub <noreply@github.com>
Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)
diff --cc bin/daemon.php
Simple merge
diff --cc src/Core/L10n.php
Simple merge
diff --cc src/Protocol/Diaspora.php
Simple merge
diff --cc src/Util/HTTPSignature.php
Simple merge
diff --cc src/Worker/OnePoll.php
Simple merge
diff --cc view/theme/frio/theme.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)
committer	GitHub <noreply@github.com>
	Mon, 20 Jan 2020 03:22:57 +0000 (22:22 -0500)
		1	2
bin/daemon.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Core/L10n.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/Diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Util/HTTPSignature.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Worker/OnePoll.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/frio/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history