community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
072119d7df
device-mgt-core/components/policy-mgt
History
charitha 5f68953b11 Merge branch 'master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
2016-10-25 14:22:44 +05:30
..
org.wso2.carbon.complex.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
org.wso2.carbon.policy.information.point [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
org.wso2.carbon.policy.mgt.common Merge branch 'master' into IoTS-1.0.0 2016-10-25 14:22:44 +05:30
org.wso2.carbon.policy.mgt.core Merge branch 'master' into IoTS-1.0.0 2016-10-25 14:22:44 +05:30
org.wso2.carbon.simple.policy.decision.point [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
pom.xml [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00