diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-20 08:53:23 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-04-20 08:53:23 +0200 |
| commit | 2e9aa87a7b82a5c453ac0114c7361c2eece1a7ea (patch) | |
| tree | a4dc7d590a3728edc64a95b2ad310df9bfa19637 /src/web/views/api/v3/__init__.py | |
| parent | Authenticate the user via the request. (diff) | |
| parent | Added a blueprint for the Flask-Restless feed api. (diff) | |
| download | newspipe-2e9aa87a7b82a5c453ac0114c7361c2eece1a7ea.tar.gz newspipe-2e9aa87a7b82a5c453ac0114c7361c2eece1a7ea.tar.bz2 newspipe-2e9aa87a7b82a5c453ac0114c7361c2eece1a7ea.zip | |
Fix conflicts.
Diffstat (limited to 'src/web/views/api/v3/__init__.py')
| -rw-r--r-- | src/web/views/api/v3/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/web/views/api/v3/__init__.py b/src/web/views/api/v3/__init__.py index 76aa1f19..04dd28ad 100644 --- a/src/web/views/api/v3/__init__.py +++ b/src/web/views/api/v3/__init__.py @@ -1,3 +1,3 @@ -from web.views.api.v3 import article +from web.views.api.v3 import article, feed -__all__ = ['article'] +__all__ = ['article', 'feed'] |