diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-15 15:33:31 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-15 15:33:31 +0200 |
| commit | a1eac64a926aeeec8babac775aa689dab4a598d3 (patch) | |
| tree | 89f1f780149b6a8649f10f20e23d88635996fc6c /prosody.cfg.lua.dist | |
| parent | 6b32fb12b118afd85c6efbf35187a9298ace9167 (diff) | |
| parent | 0ee5b781b852a955144f4c04f732ae0de19ed174 (diff) | |
| download | prosody-a1eac64a926aeeec8babac775aa689dab4a598d3.tar.gz prosody-a1eac64a926aeeec8babac775aa689dab4a598d3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions