aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/templates/edit_feed.html
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/templates/edit_feed.html
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/templates/edit_feed.html')
-rw-r--r--pyaggr3g470r/templates/edit_feed.html5
1 files changed, 0 insertions, 5 deletions
diff --git a/pyaggr3g470r/templates/edit_feed.html b/pyaggr3g470r/templates/edit_feed.html
index f1a61b89..1238e257 100644
--- a/pyaggr3g470r/templates/edit_feed.html
+++ b/pyaggr3g470r/templates/edit_feed.html
@@ -15,11 +15,6 @@
{{ form.site_link.label }}
{{ form.site_link(class_="form-control", placeholder="Optional") }} {% for error in form.site_link.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
- {% if not_on_heroku %}
- {{ form.email_notification.label }}
- {{ form.email_notification(class_="checkbox") }}
- {% endif %}
-
{{ form.enabled.label }}
{{ form.enabled(class_="checkbox") }}
bgstack15