charitha 1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs		2016-12-01 17:12:10 +05:30
..
org.wso2.carbon.device.mgt.extensions.device.type.deployer	Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x	2016-12-01 17:12:10 +05:30
org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00