diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-22 13:43:02 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-22 13:43:02 -0600 |
| commit | 79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f (patch) | |
| tree | 13ff8e38e996682451271d5616ea88c91eb8590e /mediagoblin/db/models.py | |
| parent | 55a04f01b881830f164e8a1b0a695dead6cddba3 (diff) | |
| parent | dc4dfbde350fdd9eac50448e42f2c8b209dd6ea8 (diff) | |
| download | mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.tar.lz mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.tar.xz mediagoblin-79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f.zip | |
Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 782bf869..7e2cc7d2 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -63,6 +63,7 @@ class User(Base, UserMixin): # Intented to be nullable=False, but migrations would not work for it # set to nullable=True implicitly. wants_comment_notification = Column(Boolean, default=True) + license_preference = Column(Unicode) verification_key = Column(Unicode) is_admin = Column(Boolean, default=False, nullable=False) url = Column(Unicode) |