device-mgt-core/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature
Ace 154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
..
src/main/resources Adding device management extension feature 2015-07-24 12:19:55 +05:30
pom.xml Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:08:21 +05:30