aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/views/api
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/views/api
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/views/api')
-rw-r--r--pyaggr3g470r/views/api/feed.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pyaggr3g470r/views/api/feed.py b/pyaggr3g470r/views/api/feed.py
index 625ad52d..898e30b0 100644
--- a/pyaggr3g470r/views/api/feed.py
+++ b/pyaggr3g470r/views/api/feed.py
@@ -13,7 +13,6 @@ FEED_ATTRS = {'title': {'type': str},
'description': {'type': str},
'link': {'type': str},
'site_link': {'type': str},
- 'email_notification': {'type': bool, 'default': False},
'enabled': {'type': bool, 'default': True},
'etag': {'type': str, 'default': ''},
'last_modified': {'type': str},
bgstack15