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
..
apimgt-extensions	config update	2016-10-09 22:47:17 +05:30
certificate-mgt	Updated MSSQL scripts to have IF-NOT-EXISTS statements	2016-10-03 12:16:01 +05:30
device-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-10 15:29:10 +05:30
device-mgt-extensions	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
dynamic-client-registration	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
email-sender	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
etc	Added license file to features	2016-07-29 12:44:51 +05:30
jwt-client	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
oauth-extensions	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
policy-mgt	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
webapp-authenticator-framework	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30