ayyoob 2afa84bfb4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 ... Conflicts: pom.xml		2017-06-12 11:50:03 +05:30
..
src/main	few fixes after testing	2017-06-04 18:18:20 +05:30
pom.xml	[WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration	2017-06-09 13:55:42 +05:30