diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-10 02:55:38 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-10 02:55:38 +0100 |
commit | 21a13c5bca4e9f3b87dff4edfb0a291da128b8a3 (patch) | |
tree | 0c45bcdafed730fb0e14edfd08a8f649bf100fa6 /prosody.cfg.lua.dist | |
parent | dec1fd604cc7dedef23b3885013fa821492ef86b (diff) | |
parent | bbaaaa99a4da333262792a211c46ec93ae0b270a (diff) | |
download | prosody-21a13c5bca4e9f3b87dff4edfb0a291da128b8a3.tar.gz prosody-21a13c5bca4e9f3b87dff4edfb0a291da128b8a3.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions