device-mgt-core

Commit Graph

Author	SHA1	Message	Date
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	7 years ago
ayyoob	7ab52af66e	add http pushnotification	7 years ago

Author

SHA1

Message

Date

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

ayyoob

7ab52af66e

add http pushnotification

1 2 3 4

152 Commits (c0735b584281c3814376dfde4bcf926b26019649)