diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-25 15:40:35 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-25 15:40:35 +0100 |
commit | a50400a3c22434805b4220379070b09930639063 (patch) | |
tree | 510af1472114eea8f6d102eddf1506f3b8b7dcfa /util/dataforms.lua | |
parent | 85fba1e8697d6fb0508303d866181b8b277f05d6 (diff) | |
parent | 05db1004dc198727112080224c97cb586760ab1d (diff) | |
download | prosody-a50400a3c22434805b4220379070b09930639063.tar.gz prosody-a50400a3c22434805b4220379070b09930639063.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/dataforms.lua')
0 files changed, 0 insertions, 0 deletions