aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/models
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-03-03 23:30:16 +0100
commit41cb78173636e0f6f463280afdf050583dbdb3dc (patch)
tree42224fe408d3048f210b565413feb34bfe08940c /pyaggr3g470r/models
parentlast fixes (diff)
parentTypo. (diff)
downloadnewspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.gz
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.tar.bz2
newspipe-41cb78173636e0f6f463280afdf050583dbdb3dc.zip
Merge remote-tracking branch 'origin/master' into evol/api
Conflicts: bootstrap.py pyaggr3g470r/models.py pyaggr3g470r/notifications.py pyaggr3g470r/rest.py
Diffstat (limited to 'pyaggr3g470r/models')
-rw-r--r--pyaggr3g470r/models/feed.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py
index 176f0f01..28cb2b92 100644
--- a/pyaggr3g470r/models/feed.py
+++ b/pyaggr3g470r/models/feed.py
@@ -42,7 +42,6 @@ class Feed(db.Model):
description = db.Column(db.String(), default="FR")
link = db.Column(db.String())
site_link = db.Column(db.String(), default="")
- email_notification = db.Column(db.Boolean(), default=False)
enabled = db.Column(db.Boolean(), default=True)
created_date = db.Column(db.DateTime(), default=datetime.now)
bgstack15