Software / code / prosody
Diff
util/vcard.lua @ 7506:8cca24bea3e0
mod_bosh: Fix merge mistakes from c8923f882274
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 18:57:30 +0200 |
| parent | 6400:95241c0f9244 |
| child | 8382:e5d00bf4a4d5 |