Merge branch 'master' into development
Showing
- partners/constants.py 1 addition, 0 deletionspartners/constants.py
- partners/forms.py 6 additions, 2 deletionspartners/forms.py
- partners/migrations/0012_auto_20170612_2006.py 30 additions, 0 deletionspartners/migrations/0012_auto_20170612_2006.py
- partners/migrations/0013_auto_20170623_0806.py 25 additions, 0 deletionspartners/migrations/0013_auto_20170623_0806.py
- partners/templates/partners/_prospective_partner_card.html 1 addition, 0 deletionspartners/templates/partners/_prospective_partner_card.html
- partners/templates/partners/email_prospartner_generic.html 29 additions, 0 deletionspartners/templates/partners/email_prospartner_generic.html
- partners/urls.py 2 additions, 0 deletionspartners/urls.py
- partners/utils.py 10 additions, 0 deletionspartners/utils.py
- partners/views.py 32 additions, 0 deletionspartners/views.py
- production/migrations/0008_auto_20170623_0833.py 19 additions, 0 deletionsproduction/migrations/0008_auto_20170623_0833.py
- production/models.py 3 additions, 0 deletionsproduction/models.py
- scipost/constants.py 1 addition, 0 deletionsscipost/constants.py
- scipost/migrations/0056_auto_20170623_0806.py 30 additions, 0 deletionsscipost/migrations/0056_auto_20170623_0806.py
- submissions/migrations/0046_auto_20170623_0806.py 20 additions, 0 deletionssubmissions/migrations/0046_auto_20170623_0806.py
- templates/email/email_prospartner_contact.html 7 additions, 4 deletionstemplates/email/email_prospartner_contact.html
- templates/email/email_prospartner_contact_html.html 8 additions, 4 deletionstemplates/email/email_prospartner_contact_html.html
Loading
Please register or sign in to comment