ayyoob 671d931d3e merged with origin after resolving conflicts		2017-01-12 23:24:35 +05:30
..
java/org/wso2/carbon/device/mgt/jaxrs	merged with origin after resolving conflicts	2017-01-12 23:24:35 +05:30
webapp	removed unused parameter	2017-01-12 19:09:01 +05:30