aboutsummaryrefslogtreecommitdiff
path: root/manager.py
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 /manager.py
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 'manager.py')
0 files changed, 0 insertions, 0 deletions
bgstack15