Merge branch 'master' into tech-failures

This commit is contained in:
Rebecca Law
2016-05-17 12:05:48 +01:00
4 changed files with 57 additions and 1 deletions

View File

@@ -98,6 +98,7 @@ class Service(db.Model, Versioned):
email_from = db.Column(db.Text, index=False, unique=True, nullable=False)
created_by = db.relationship('User')
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
reply_to_email_address = db.Column(db.Text, index=False, unique=False, nullable=True)
class ApiKey(db.Model, Versioned):