Software / code / prosody
Diff
plugins/mod_register.lua @ 525:32122251d2fe
Remove stray merge marker
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 03 Dec 2008 16:01:58 +0000 |
| parent | 519:cccd610a0ef9 |
| child | 541:3521e0851c9e |