Merge conflict version 2 (54c9fe75) · Commits · SciPost / SciPost · GitLab

SciPost Code Repository

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SciPost
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

54c9fe75

Commit 54c9fe75 authored 7 years ago by Jorran de Wit

Downloads
- Patches
- Plain Diff

Merge conflict version 2

parent 81dff8d5

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

mails/templates/mail_templates/partners_followup_mail.html 34 additions, 9 deletions

mails/templates/mail_templates/partners_followup_mail.html
mails/templates/mail_templates/partners_initial_mail.html 5 additions, 3 deletions

mails/templates/mail_templates/partners_initial_mail.html
mails/templates/mail_templates/partners_initial_mail.txt 0 additions, 33 deletions

mails/templates/mail_templates/partners_initial_mail.txt

with 39 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

SciPost Code Repository