diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-27 00:03:14 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-27 00:03:14 +0200 |
commit | ec503579285d613085de37168feffa3ad9ea793d (patch) | |
tree | 505b848be10efd4cdb0528f043078c23750982ef /prosody.cfg.lua.dist | |
parent | 0c4b66c051b2d199703713c634477fd1a2d62789 (diff) | |
parent | 36352ec3c11bcdbc04b7b61d851135da9fa3ba34 (diff) | |
download | prosody-ec503579285d613085de37168feffa3ad9ea793d.tar.gz prosody-ec503579285d613085de37168feffa3ad9ea793d.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions