Merge branch 'master' of ssh://bitbucket.org/yackob03/quay into webhooks

Conflicts:
	endpoints/api.py
	test/data/test.db
This commit is contained in:
yackob03 2013-11-15 16:48:55 -05:00
commit 7ae78e5370
18 changed files with 487 additions and 185 deletions

View file

@ -34,6 +34,7 @@ class User(BaseModel):
verified = BooleanField(default=False)
stripe_id = CharField(index=True, null=True)
organization = BooleanField(default=False, index=True)
invoice_email = BooleanField(default=False)
class TeamRole(BaseModel):