aboutsummaryrefslogtreecommitdiff
path: root/src/web/models/__init__.py
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2017-05-23 21:24:04 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2017-05-23 21:24:04 +0200
commitec30925914fba06ba73a748d745c1a7356f2e53d (patch)
tree31063d7fff39852b16dc70d529eddb8c0dd737e4 /src/web/models/__init__.py
parentFixed conflicts. (diff)
downloadnewspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.tar.gz
newspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.tar.bz2
newspipe-ec30925914fba06ba73a748d745c1a7356f2e53d.zip
Improved display of bookmark's tags. And fixed some remainings merge related bugs.
Diffstat (limited to 'src/web/models/__init__.py')
-rw-r--r--src/web/models/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py
index 1fc0c3e0..45bfb096 100644
--- a/src/web/models/__init__.py
+++ b/src/web/models/__init__.py
@@ -32,9 +32,12 @@ from .user import User
from .article import Article
from .icon import Icon
from .category import Category
-from .tag import Tag
+from .tag import BookmarkTag
+from .tag import ArticleTag
+from .bookmark import Bookmark
-__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag']
+__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category',
+ 'Bookmark', 'ArticleTag', 'BookmarkTag']
import os
bgstack15