Merge remote-tracking branch 'upstream/develop' into channel-relay
authorMichael <heluecht@pirati.ca>
Mon, 15 Jan 2024 06:14:55 +0000 (06:14 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 15 Jan 2024 06:14:55 +0000 (06:14 +0000)
commit7a13d8b8acd71d631ea4d7c33e36b73f9b66e11f
tree36c831671ddc7bf41d50a7fbac862f6e729d5f92
parent98de6ad4648ce3e0b5e7f5078293d4a078ff796a
parent60b81bb6cab6047dbb839674376597c42b621cb9
Merge remote-tracking branch 'upstream/develop' into channel-relay
src/Model/Contact.php
src/Model/User.php
view/lang/C/messages.po