Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update 2d21356c62cd
# Note: This will create a new head!
hg merge bf2d0cba3df7
hg commit -m 'Merged in bugfix/group-join-request-deny-reason (pull request #87)'
Removed reason string from group join request deny email body as it is not possible to write a reason in the frontend at the moment. As this might be the case in the future, I only adapted the message properties.
Breaks JoinGroupController. Is this controller used anymore?
As far as I can see this controller is not used at the moment and even if only the reason is stripped from the email.