charitha 1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs		2016-12-01 17:12:10 +05:30
..
apimgt-extensions	added new property : validity Period	2016-11-30 12:33:36 +05:30
certificate-mgt	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
device-mgt	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-01 16:47:05 +05:30
device-mgt-extensions	Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x	2016-12-01 17:12:10 +05:30
email-sender	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00
identity-extensions	Merge with release-2.0.x branch	2016-11-25 14:24:20 +05:30
policy-mgt	Adding changes for the grouping and ownership changes	2016-12-01 16:35:59 +05:30
webapp-authenticator-framework	[maven-release-plugin] prepare for next development iteration	2016-11-25 08:06:30 +00:00