aboutsummaryrefslogtreecommitdiff
path: root/conf
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 /conf
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 'conf')
-rw-r--r--conf/conf.cfg-sample1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/conf.cfg-sample b/conf/conf.cfg-sample
index 6e4bb7b7..4f1e06c6 100644
--- a/conf/conf.cfg-sample
+++ b/conf/conf.cfg-sample
@@ -18,7 +18,6 @@ host = 0.0.0.0
port = 5000
secret = a secret only you know
[notification]
-enabled = 0
email = pyAggr3g470r@no-reply.com
host = smtp.googlemail.com
port = 465
bgstack15