Software /
code /
prosody-modules
Diff
mod_vcard_muc/mod_vcard_muc.lua @ 6211:750d64c47ec6 draft default tip
Merge
author | Trần H. Trung <xmpp:trần.h.trung@trung.fun> |
---|---|
date | Tue, 18 Mar 2025 00:31:36 +0700 |
parent | 6194:3e7fe14921d0 |
line wrap: on
line diff
--- a/mod_vcard_muc/mod_vcard_muc.lua Tue Mar 18 00:19:25 2025 +0700 +++ b/mod_vcard_muc/mod_vcard_muc.lua Tue Mar 18 00:31:36 2025 +0700 @@ -6,6 +6,7 @@ -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- +--% conflicts: muc_vcard local st = require "util.stanza" local jid_split = require "util.jid".split;