Merge pull request #13291 from Quix0r/features/config-blocklist-published

author Hypolite Petovan <hypolite@mrpetovan.com>

Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)

committer GitHub <noreply@github.com>

Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)
committer GitHub <noreply@github.com>
Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)
diff --cc src/Module/Friendica.php
Simple merge
diff --cc static/defaults.config.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)
committer	GitHub <noreply@github.com>
	Sat, 12 Aug 2023 09:31:42 +0000 (11:31 +0200)
		1	2
src/Module/Friendica.php	patch \|	diff1 \|	diff2 \|	blob \| history
static/defaults.config.php	patch \|	diff1 \|	diff2 \|	blob \| history