diff options
author | Kim Alvefur <zash@zash.se> | 2017-12-09 15:40:37 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-12-09 15:40:37 +0100 |
commit | d6405de8e247061949162605fdeed3549de01928 (patch) | |
tree | ca3f01bf0171c53a964ec2b01ee75d8b5dcb625e /util/dataforms.lua | |
parent | 7558a8478a1066f95033b9a760b5e39b98bd1fbb (diff) | |
parent | 253cf6e86d69a70909d221d36f8261770e1f3feb (diff) | |
download | prosody-d6405de8e247061949162605fdeed3549de01928.tar.gz prosody-d6405de8e247061949162605fdeed3549de01928.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/dataforms.lua')
0 files changed, 0 insertions, 0 deletions