Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

2011-07-13 23:19:46 -05:00
parent c47c37ed95 4c465852d1
commit fb5075e6b2
3 changed files with 9 additions and 4 deletions
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -46,7 +46,8 @@ class User(Document):
        'verification_key': unicode,
        'is_admin': bool,
        'url' : unicode,
-        'bio' : unicode
+        'bio' : unicode,     # May contain markdown
+        'bio_html': unicode, # May contain plaintext, or HTML
        }

    required_fields = ['username', 'created', 'pw_hash', 'email']