diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-04-30 08:27:15 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-04-30 08:27:15 -0500 |
| commit | 776331fd96b55dba004e8bb5a10e02a555bf76c1 (patch) | |
| tree | 5cf332de13e8cd47d72e9916896e14c93886a8ba /mediagoblin/models.py | |
| parent | 1bb0fdf2f4f568019c3449f269c69f406507bd7c (diff) | |
| parent | 87b44d61ef4c1ace855540ab35f047a2067e277c (diff) | |
| download | mediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.tar.lz mediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.tar.xz mediagoblin-776331fd96b55dba004e8bb5a10e02a555bf76c1.zip | |
Merge branch 'master' into celerysubmit
Diffstat (limited to 'mediagoblin/models.py')
| -rw-r--r-- | mediagoblin/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/models.py b/mediagoblin/models.py index 9e0ee8ca..eef59ed4 100644 --- a/mediagoblin/models.py +++ b/mediagoblin/models.py @@ -49,7 +49,7 @@ class User(Document): 'created': datetime.datetime.utcnow, 'email_verified': False, # TODO: shouldn't be active by default, must have email registration - 'status': 'active'} + 'status': u'active'} def check_login(self, password): """ |