Merge branch 'master' into develop

pallets-eco · Apr 30, 2014 · cc8c2e9 · cc8c2e9
2 parents 54d6c1d + 83fd516
commit cc8c2e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/index.rst b/docs/index.rst
@@ -135,7 +135,7 @@ index::
 
     class Connection(db.Model):
         id = db.Column(db.Integer, primary_key=True)
-        user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+        user = db.relationship('user')
         provider_id = db.Column(db.String(255))
         provider_user_id = db.Column(db.String(255))
         access_token = db.Column(db.String(255))