device-mgt-core/components
Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
2016-09-20 17:02:28 +05:30
..
apimgt-extensions Merging with master 2016-09-19 12:21:41 +05:30
certificate-mgt Merging with master 2016-09-19 12:21:41 +05:30
device-mgt Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 17:02:28 +05:30
device-mgt-extensions Merging with master 2016-09-19 12:21:41 +05:30
email-sender Updating velocity dependencies to OSGI enabled bundle version 2016-09-20 10:38:39 +05:30
identity-extensions Merging with master 2016-09-19 12:21:41 +05:30
policy-mgt Merging with master 2016-09-19 12:21:41 +05:30
webapp-authenticator-framework Merging with master 2016-09-19 12:21:41 +05:30