ayyoob 6c7f911cbc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js		2017-06-08 14:39:51 +05:30
..
src/main/resources	add http pushnotification	2017-06-08 14:24:33 +05:30
pom.xml	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-08 14:39:51 +05:30