Merge branch 'master' into emq10

This commit is contained in:
Feng Lee 2016-05-03 18:29:25 +08:00
commit 816827e1ee
1 changed files with 1 additions and 1 deletions

View File

@ -21,7 +21,7 @@
compiler, compiler,
runtime_tools, runtime_tools,
lager, lager,
{gen_logger, load}, gen_logger,
gproc, gproc,
esockd, esockd,
mochiweb, mochiweb,