device-mgt-core/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature
sinthuja 783ead216e Merge branch 'wso2-application-mgt' into application-mgt
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
2017-09-07 12:32:50 +05:30
..
src/main/resources Merge branch 'wso2-application-mgt' into application-mgt 2017-09-07 12:32:50 +05:30
pom.xml Merging with master 2017-07-25 11:19:46 +05:30