diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-29 11:24:59 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-29 11:24:59 +0100 |
| commit | abf0d19152cbf880252435d2801d852ce0459df8 (patch) | |
| tree | bfde55649a88754f29d5bdbd68d3d2817675d3e8 /core/discomanager.lua | |
| parent | a718775bd40db918564a31e90f4c17a98a4cecfc (diff) | |
| parent | dcf87bb7c912e4206aae1fd3c959d87e8f59242f (diff) | |
| download | prosody-abf0d19152cbf880252435d2801d852ce0459df8.tar.gz prosody-abf0d19152cbf880252435d2801d852ce0459df8.zip | |
Forced merge.
Diffstat (limited to 'core/discomanager.lua')
0 files changed, 0 insertions, 0 deletions