diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
| commit | 6f1ffa163d7e1624892aead18a400744750f29f8 (patch) | |
| tree | a2ed9fcc1c1496bdcbdf1da40e868aa4d50246fa /prosody | |
| parent | 6d2aec4a34dde4d20cc4a6f7e0a9a6db8057a630 (diff) | |
| parent | e0c0cffcc27601ec9e4dd3d6fcb556baa21f1e21 (diff) | |
| download | prosody-6f1ffa163d7e1624892aead18a400744750f29f8.tar.gz prosody-6f1ffa163d7e1624892aead18a400744750f29f8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -292,6 +292,7 @@ function load_secondary_libraries() require "util.import" require "util.xmppstream" require "core.stanza_router" + require "core.statsmanager" require "core.hostmanager" require "core.portmanager" require "core.modulemanager" |