mharindu 695ff8edcb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml		2015-05-21 19:51:32 +05:30
..
device-mgt	Merged	2015-05-20 14:25:17 +05:30
oauth-extensions	Adding simple policy processing engine implementation together with some oauth extension implementation to support dynamic client authentication	2015-04-03 20:57:51 +05:30
policy-mgt	Adding pofile operations	2015-05-21 17:46:57 +05:30
user-mgt	Adding the user core changes	2015-05-19 20:45:12 +05:30
webapp-authenticator-framework	Fixing build failures	2015-05-21 19:16:40 +05:30