Mercurial > prosody-hg
diff util/template.lua @ 7467:9a73c85baffe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | ff514c1b1c27 |
| children | ad1e10c93b41 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 08 Jul 2016 15:12:44 +0200 |
| parents | ff514c1b1c27 |
| children | ad1e10c93b41 |