Mercurial > prosody-hg
diff util/dataforms.lua @ 7861:58dbe5afeb4a
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 24 Jan 2017 21:24:03 +0100 |
| parents | 0db72fac2faa |
| children | d70d4c1ac17a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 24 Jan 2017 21:24:03 +0100 |
| parents | 0db72fac2faa |
| children | d70d4c1ac17a |