device-mgt-core/components/webapp-authenticator-framework
Dunith Dhanushka 7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
2017-11-22 11:14:32 +05:30
..
org.wso2.carbon.webapp.authenticator.framework Merge branch 'master' of git://github.com/wso2/carbon-device-mgt 2017-11-22 11:14:32 +05:30
pom.xml [WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration 2017-11-17 10:03:15 +00:00