]> git.mxchange.org Git - friendica.git/commit
Merge branch 'develop' into Art4/fix-code-style-for-pr-14688
authorHypolite Petovan <hypolite@mrpetovan.com>
Thu, 23 Jan 2025 02:05:24 +0000 (21:05 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Thu, 23 Jan 2025 02:05:24 +0000 (21:05 -0500)
commit822b4429f337e05cf3c10c75835319857101a148
treee5520a79fce9a468d22c9629b46d7511dd12de71
parent6309d4c43d58de0e576e67e28127eb284eb7dfc5
parent0d97118cfb7dad843302d5e08c3492f49ebd2c3d
Merge branch 'develop' into Art4/fix-code-style-for-pr-14688

# Conflicts:
# src/Model/GServer.php
# src/Util/HTTPSignature.php