darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 08:51:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
406 Commits 128 Branches 60 Tags
dd503e7f14fbb415b0476b2bc86cc1cc9fb0308d
Commit Graph

2 Commits

Author SHA1 Message Date
Martyn Inglis
886b206d63 Merge branch 'master' into email-templates 
Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py
 2016-02-22 13:12:24 +00:00
Martyn Inglis
f8ac14ea30 Update model 
- adds email_from field to the service model
- adds subject_line to the template model

These are unique and not null fields, so there is a migration here for email_from to populate it.
 2016-02-19 15:52:19 +00:00