charitha a9cb2ae84d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java		2020-12-11 17:26:53 +05:30
..
apimgt-extensions	Adding operation partitioning functionality	2020-11-15 22:56:10 +05:30
application-mgt	Merge branch 'lasantha' into 'master'	2020-12-07 09:24:20 +00:00
certificate-mgt	[maven-release-plugin] prepare for next development iteration	2020-06-22 10:06:05 +00:00
device-mgt	Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt	2020-12-11 17:26:53 +05:30
device-mgt-extensions	Fix incorrect instantiations of Provider Services	2020-07-14 01:54:06 +00:00
email-sender	[maven-release-plugin] prepare for next development iteration	2020-06-22 10:06:05 +00:00
heartbeat-management	Addressing review comments	2020-12-07 13:27:57 +05:30
identity-extensions	[maven-release-plugin] prepare for next development iteration	2020-06-22 10:06:05 +00:00
policy-mgt	Improve metadata API	2020-12-07 20:15:18 +00:00
test-coverage	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
ui-request-interceptor	Implement oidc based sso among all web apps	2020-12-04 10:06:00 +05:30
webapp-authenticator-framework	Improve code formatting	2020-08-21 09:18:55 +05:30