device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.api
sinthuja e6ff84918e Merge branch 'wso2-master'
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
2017-08-31 15:38:00 +05:30
..
src/main Merge branch 'wso2-master' 2017-08-31 15:38:00 +05:30
pom.xml Merge branch 'wso2-master' 2017-08-31 15:38:00 +05:30