Please fix the merge conflicts in the .pot file and the changelog when you get a chance. :)
« Back to merge proposal
Please fix the merge conflicts in the .pot file and the changelog when you get a chance. :)