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
..
apimgt-extensions	Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.	2016-10-24 16:37:00 +05:30
certificate-mgt	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
device-mgt	Merge branch 'master' into IoTS-1.0.0	2016-10-25 14:22:44 +05:30
device-mgt-extensions	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
email-sender	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
identity-extensions	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00
policy-mgt	Merge branch 'master' into IoTS-1.0.0	2016-10-25 14:22:44 +05:30
webapp-authenticator-framework	[maven-release-plugin] prepare for next development iteration	2016-10-18 12:17:27 +00:00