device-mgt-core/components/policy-mgt
charitha 670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
2016-10-10 15:29:10 +05:30
..
org.wso2.carbon.complex.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
org.wso2.carbon.policy.information.point [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
org.wso2.carbon.policy.mgt.common Upgrade to comply with latest CDMF changes 2016-10-04 19:03:07 +05:30
org.wso2.carbon.policy.mgt.core Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-10 15:29:10 +05:30
org.wso2.carbon.simple.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
pom.xml [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30