diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-06 10:55:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-06 10:55:09 +0100 |
| commit | 6d743a0544280a231a08d8ab6aeedf9d57090c2a (patch) | |
| tree | 3064e12f6513a9f471d36bf905f4723a7aa3e292 /prosody.cfg.lua.dist | |
| parent | 7a257adaffd2bc14ac33045c4563d428b41d69cb (diff) | |
| parent | 73f394eec544993923ba0b1bbd4eed78051bd59f (diff) | |
| download | prosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.tar.gz prosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions