diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 14:07:49 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 14:07:49 +0200 |
| commit | 2a747d386dbdc05453fce6b8be3f483e8cd9e796 (patch) | |
| tree | 5530f2fb8856c4e29a33afb128843108e2bb5834 /app/views/notify/project_invite_accepted_email.text.erb | |
| parent | 862b359b9a3f271b23f393932fb0e85d65c56c6b (diff) | |
| parent | 778d72664f386dfee45dab171f137395739958f6 (diff) | |
| download | gitlab-ce-2a747d386dbdc05453fce6b8be3f483e8cd9e796.tar.gz | |
fixed merge conflicts
Diffstat (limited to 'app/views/notify/project_invite_accepted_email.text.erb')
| -rw-r--r-- | app/views/notify/project_invite_accepted_email.text.erb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/views/notify/project_invite_accepted_email.text.erb b/app/views/notify/project_invite_accepted_email.text.erb deleted file mode 100644 index fcbe752114d..00000000000 --- a/app/views/notify/project_invite_accepted_email.text.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= @project_member.invite_email %>, now known as <%= @project_member.user.name %>, has accepted your invitation to join project <%= @project.name_with_namespace %>. - -<%= namespace_project_url(@project.namespace, @project) %> |