Branch: refs/heads/issue1104 Home: https://github.com/RestComm/Restcomm-Connect Commit: 0160903e2fbc8fd677a3f086018966f443891f0a https://github.com/RestComm/Restcomm-Connect/commit/0160903e2fbc8fd677a3f086018966f443891f0a Author: Maria Farooq <maria-far...@live.com> Date: 2016-10-05 (Wed, 05 Oct 2016)
Changed paths: M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml Log Message: ----------- resolved another conflict -- --- You received this message because you are subscribed to the Google Groups "mobicents-commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to mobicents-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.