Merge pull request #601 in FS/freeswitch from ~ANDCOFFEECODE/freeswitch:bugfix/FS...

author Ítalo Rossi <italorossib@gmail.com>

Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)

committer Ítalo Rossi <italorossib@gmail.com>

Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)
author Ítalo Rossi <italorossib@gmail.com>
Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)
committer Ítalo Rossi <italorossib@gmail.com>
Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)
diff --cc html5/verto/verto_communicator/src/css/verto.css
Simple merge
diff --cc html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
Simple merge
author	Ítalo Rossi <italorossib@gmail.com>
	Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)
committer	Ítalo Rossi <italorossib@gmail.com>
	Tue, 17 Nov 2015 20:40:43 +0000 (14:40 -0600)
		1	2
html5/verto/verto_communicator/src/css/verto.css	patch \|	diff1 \|	diff2 \|	blob \| history
html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js	patch \|	diff1 \|	diff2 \|	blob \| history