samba | Samba-tool: add rfc2307 attributes to an existing user or group (!602)

[Rowland penny]

On 04/07/2019 05:41, Rowland Penny wrote:
> GitLab
>
> Merge Request !602 
> <https://gitlab.com/samba-team/samba/merge_requests/602> can no longer 
> be merged due to conflict.
>
> —
> Reply to this email directly or view it on GitLab 
> <https://gitlab.com/samba-team/samba/merge_requests/602>.
> You're receiving this email because of your account on gitlab.com. If 
> you'd like to receive fewer emails, you can unsubscribe 
> <https://gitlab.com/sent_notifications/e96467d609d32b58b3fd44217998eb3f/unsubscribe> 
> from this thread or adjust your notification settings.
>
Hi, can somebody have a look at this before I have to rebase it again

Rowland