device-mgt-core/components/policy-mgt
charitha ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
..
org.wso2.carbon.complex.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
org.wso2.carbon.policy.information.point [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
org.wso2.carbon.policy.mgt.common Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 14:47:21 +05:30
org.wso2.carbon.policy.mgt.core Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 14:47:21 +05:30
org.wso2.carbon.simple.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
pom.xml [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00