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

Merge branch 'master' into email-templates

Browse Source 
Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py
This commit is contained in:
Martyn Inglis
2016-02-22 13:12:24 +00:00
parent cc720b137f 4516dc4331
commit 886b206d63
10 changed files with 527 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
migrations/versions/0015_add_subject_line.py
View File

@@ -1,14 +1,14 @@
"""empty message
Revision ID: 0015_add_subject_line
Revises: 0014_job_id_nullable
Revises: 0015_add_permissions
Create Date: 2016-02-18 09:43:29.282804
"""
# revision identifiers, used by Alembic.
revision = '0015_add_subject_line'
down_revision = '0014_job_id_nullable'
down_revision = '0015_add_permissions'
from alembic import op
import sqlalchemy as sa