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.

Nipuni Kavindya 7a0299419a Merge branch 'APPM_Imp' of https://repository.entgra.net/community/device-mgt-core into apim-issues ... # Conflicts: # components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/subscription/GenericSubscriptionDAOImpl.java # components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java		4 months ago
..
io.entgra.device.mgt.core.application.mgt.common	Fix merge conflicts	4 months ago
io.entgra.device.mgt.core.application.mgt.core	Merge branch 'APPM_Imp' of https://repository.entgra.net/community/device-mgt-core into apim-issues	4 months ago
pom.xml	[maven-release-plugin] prepare for next development iteration	4 months ago