You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

prabathabey 7e8f38cf16 Fixing conflicts while merging the latest changes in master		9 years ago
..
org.wso2.carbon.device.mgt.analytics.dashboard	…
org.wso2.carbon.device.mgt.analytics.data.publisher	…
org.wso2.carbon.device.mgt.api	Fixing conflicts while merging the latest changes in master	9 years ago
org.wso2.carbon.device.mgt.common	Resolving conflicts caused by merging with the updates in master	9 years ago
org.wso2.carbon.device.mgt.core	Resolving conflicts caused by merging with the updates in master	9 years ago
org.wso2.carbon.device.mgt.extensions	…
org.wso2.carbon.device.mgt.ui	added entry for websocket url	9 years ago
pom.xml	…