-
Conflicts: asterisk/admin/macro/class_gofonMacro.inc asterisk/admin/systems/asterisk/class_phoneGeneric.inc systems/admin/systems/class_printGeneric.inc
f9587bd9
Conflicts: asterisk/admin/macro/class_gofonMacro.inc asterisk/admin/systems/asterisk/class_phoneGeneric.inc systems/admin/systems/class_printGeneric.inc