charitha 0a838923cb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java		2016-05-13 12:43:53 +05:30
..
org.wso2.carbon.device.mgt.analytics.dashboard	Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature	2016-05-11 20:01:02 +05:30
org.wso2.carbon.device.mgt.analytics.data.publisher	fixes after testing	2016-05-12 02:42:29 +05:30
org.wso2.carbon.device.mgt.api	Improving swagger annotations	2016-05-13 07:39:09 +05:30
org.wso2.carbon.device.mgt.common	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 08:07:44 +05:30
org.wso2.carbon.device.mgt.core	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 00:34:54 +05:30
org.wso2.carbon.device.mgt.extensions	refactoring and bug fixes	2016-04-27 20:43:13 +05:30
org.wso2.carbon.device.mgt.ui	Add required jagerry modules for the app	2016-05-11 19:30:55 +05:30
pom.xml	removed unused code and resolved host issues	2016-05-04 01:19:56 +05:30