device-mgt-core/components/apimgt-extensions
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
..
org.wso2.carbon.apimgt.annotations [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
org.wso2.carbon.apimgt.application.extension [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
org.wso2.carbon.apimgt.application.extension.api Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-08 14:39:51 +05:30
org.wso2.carbon.apimgt.handlers [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
org.wso2.carbon.apimgt.integration.client [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
org.wso2.carbon.apimgt.integration.generated.client [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
org.wso2.carbon.apimgt.webapp.publisher [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
pom.xml [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30