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 | cd0dd3f92b02d855c98701792c179d02ad12bf24 (patch) | |
| tree | a2ed9fcc1c1496bdcbdf1da40e868aa4d50246fa /prosody | |
| parent | 6591bd9db584bf6c5b8920c4438cd087bbfefce3 (diff) | |
| parent | 5723bad906dcbef98eb1cdc196675a7a526f97cc (diff) | |
| download | prosody-cd0dd3f92b02d855c98701792c179d02ad12bf24.tar.gz prosody-cd0dd3f92b02d855c98701792c179d02ad12bf24.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" |