a852455d0e
# Conflicts: # composer.lock |
||
---|---|---|
.. | ||
dev | ||
.htaccess | ||
auth_ejabberd.php | ||
composer.phar | ||
console | ||
console.bat | ||
console.php | ||
daemon.php | ||
run_xgettext.sh | ||
testargs.php | ||
wait-for-connection | ||
worker.php |
a852455d0e
# Conflicts: # composer.lock |
||
---|---|---|
.. | ||
dev | ||
.htaccess | ||
auth_ejabberd.php | ||
composer.phar | ||
console | ||
console.bat | ||
console.php | ||
daemon.php | ||
run_xgettext.sh | ||
testargs.php | ||
wait-for-connection | ||
worker.php |