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.

Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java		9 years ago
..
apimgt-extensions	Fixing improper parent configurations found in apimgt.extensions component and feature	9 years ago
device-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	9 years ago
oauth-extensions	Refactored	9 years ago
policy-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	9 years ago
webapp-authenticator-framework	Upgrading tomcat version usd in carbon-devicemgt	9 years ago