diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-05-23 15:37:50 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2017-05-23 15:37:50 +0200 |
| commit | a756a3e9da58df6247e3437be4c13da25dab1aa0 (patch) | |
| tree | 60281271606a5cc6b718d65d998c2d97b3fa4c50 /src/web/controllers/__init__.py | |
| parent | Added UTF-8 version of the logo. (diff) | |
| parent | Update tags of bookmarks. (diff) | |
| download | newspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.tar.gz newspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.tar.bz2 newspipe-a756a3e9da58df6247e3437be4c13da25dab1aa0.zip | |
Fixed conflicts.
Diffstat (limited to 'src/web/controllers/__init__.py')
| -rw-r--r-- | src/web/controllers/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/web/controllers/__init__.py b/src/web/controllers/__init__.py index a1b89ea8..5fbc2619 100644 --- a/src/web/controllers/__init__.py +++ b/src/web/controllers/__init__.py @@ -3,7 +3,10 @@ from .category import CategoryController from .article import ArticleController from .user import UserController from .icon import IconController +from .bookmark import BookmarkController +from .tag import BookmarkTagController __all__ = ['FeedController', 'CategoryController', 'ArticleController', - 'UserController', 'IconController'] + 'UserController', 'IconController', 'BookmarkController', + 'BookmarkTagController'] |