Version 1.5.7.9
Solving conflicts
Version 1.5.7.9
Solving conflicts
Merge branch 'master' of https://github.com/donmik/buddypress-xprofile-custom-fields-type