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
..
apimgt-extensions	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
certificate-mgt	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
device-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-08 14:39:51 +05:30
device-mgt-extensions	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-06-08 14:39:51 +05:30
dynamic-client-registration	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
email-sender	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
etc	Added license file to features	2016-07-29 12:44:51 +05:30
jwt-client	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
oauth-extensions	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
policy-mgt	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30
webapp-authenticator-framework	[WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration	2017-06-07 13:44:29 +05:30