Merge remote-tracking branch 'upstream/develop' into channel-relay
authorMichael <heluecht@pirati.ca>
Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 15 Jan 2024 19:51:20 +0000 (19:51 +0000)
commit0c8c03153b035e8b27a56644c601a0c471589111
tree57e91e324ae914e1af0d967e002965204dded38c
parent98de6ad4648ce3e0b5e7f5078293d4a078ff796a
parentdd534919d7e3af010bbc2477e3d0e89a47dd0872
Merge remote-tracking branch 'upstream/develop' into channel-relay
src/Model/Contact.php
src/Model/User.php
view/lang/C/messages.po