Merge "app_attended_transfer: new application AttendedTransfer" master
authorGeorge Joseph <gjoseph@digium.com>
Wed, 12 Jun 2019 15:44:06 +0000 (10:44 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Jun 2019 15:44:06 +0000 (10:44 -0500)
1  2 
menuselect/example_menuselect-tree
menuselect/test/menuselect-tree

@@@ -8,10 -8,10 +8,12 @@@
                </member>
                <member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
                </member>
+               <member name="app_attended_transfer" displayname="Attended transfer to the given extension" remove_on_change="apps/app_attended_transfer.o apps/app_attended_transfer.so">
+               </member>
                <member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
                </member>
 +              <member name="app_blind_transfer" displayname="Blind transfer by caller channel" remove_on_change="apps/app_blind_transfer.o apps/app_blind_transfer.so">
 +              </member>
                <member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
                </member>
                <member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
Simple merge