Mercurial > prosody-hg
diff util/dataforms.lua @ 7031:89221daefae9
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Dec 2015 12:11:07 +0100 |
| parents | bcaa553de6e8 |
| children | 156c95bfed0b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Dec 2015 12:11:07 +0100 |
| parents | bcaa553de6e8 |
| children | 156c95bfed0b |