]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'friendica/stable' into develop
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 20 Sep 2020 19:32:58 +0000 (15:32 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sun, 20 Sep 2020 19:32:58 +0000 (15:32 -0400)
commita852455d0ed9824fb71c9374c9fffda28f95096f
tree23120eab9b24f5684f22064cb166a626d0f6718f
parent280458fb6541a5ae21b660e81f642d8f92df5663
parentc3725d4b3e454af92884f1a9bf3e751c725fcfec
Merge remote-tracking branch 'friendica/stable' into develop

# Conflicts:
# composer.lock
bin/worker.php
composer.json
composer.lock
src/Core/Worker.php
src/Model/Item.php