diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2015-04-06 10:37:13 +0200 |
| commit | 29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch) | |
| tree | 52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /pyaggr3g470r/models/feed.py | |
| parent | misc update (diff) | |
| parent | Minor changes to the CSS. (diff) | |
| download | newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2 newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
pyaggr3g470r/controllers/feed.py
pyaggr3g470r/templates/home.html
Diffstat (limited to 'pyaggr3g470r/models/feed.py')
| -rw-r--r-- | pyaggr3g470r/models/feed.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyaggr3g470r/models/feed.py b/pyaggr3g470r/models/feed.py index a37744d6..a36d9573 100644 --- a/pyaggr3g470r/models/feed.py +++ b/pyaggr3g470r/models/feed.py @@ -33,7 +33,7 @@ from sqlalchemy import desc class Feed(db.Model): """ - Represent a station. + Represent a feed. """ id = db.Column(db.Integer, primary_key=True) title = db.Column(db.String(), default="No title") |