Software / code / prosody-modules
Changeset
6194:3e7fe14921d0
mod_vcard_muc: Add conflict with Prosody versions that have native MUC vcards
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 06 Feb 2025 17:07:00 +0000 |
| parents | 6193:e977174082ee |
| children | 6195:886c985ece61 |
| files | mod_vcard_muc/mod_vcard_muc.lua |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_vcard_muc/mod_vcard_muc.lua Thu Feb 06 10:24:30 2025 +0000 +++ b/mod_vcard_muc/mod_vcard_muc.lua Thu Feb 06 17:07:00 2025 +0000 @@ -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;
