Log

prosody.cfg.lua.dist @ 525:32122251d2fe

description author age
Remove stray merge marker Matthew Wild Wed, 03 Dec 2008 16:01:58 +0000
Merge from waqas Matthew Wild Wed, 03 Dec 2008 15:09:58 +0000
Converted prosody.cfg.lua.dist to use windows end-of-lines Waqas Hussain Wed, 03 Dec 2008 19:56:05 +0500