Merge "loader: Convert reload_classes to built-in modules."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 19 Mar 2018 17:53:12 +0000 (12:53 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 19 Mar 2018 17:53:12 +0000 (12:53 -0500)
1  2 
apps/app_dial.c
include/asterisk/config.h
main/ccss.c
main/cdr.c
main/channel.c
main/config.c

diff --cc apps/app_dial.c
Simple merge
Simple merge
diff --cc main/ccss.c
Simple merge
diff --cc main/cdr.c
Simple merge
diff --cc main/channel.c
Simple merge
diff --cc main/config.c
Simple merge