Hypolite Petovan a852455d0e Merge remote-tracking branch 'friendica/stable' into develop ... # Conflicts: # composer.lock		2020-09-20 15:32:58 -04:00
..
dev	…
.htaccess	…
auth_ejabberd.php	…
composer.phar	…
console	…
console.bat	…
console.php	…
daemon.php	…
run_xgettext.sh	…
testargs.php	…
wait-for-connection	…
worker.php	Merge remote-tracking branch 'friendica/stable' into develop	2020-09-20 15:32:58 -04:00