diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-13 21:35:15 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-13 21:35:15 +0100 |
| commit | 8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e (patch) | |
| tree | 1e4748ff7d5957bfac141b545f93fde1e22d4985 /mediagoblin/views.py | |
| parent | bb3b9e4090706e1e9815c5132c01b9e706e31360 (diff) | |
| parent | 4535f7597f112443d8997bbd6b8a445612c2440d (diff) | |
| download | mediagoblin-8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e.tar.lz mediagoblin-8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e.tar.xz mediagoblin-8d52214f1e7b6d446fdf34fbfc8328f08eafbb1e.zip | |
Merge remote branch 'joar/b681-comments_from_reviewing_video'
* joar/b681-comments_from_reviewing_video:
Bug 681 - Comments from reviewing the new video merge
Diffstat (limited to 'mediagoblin/views.py')
| -rw-r--r-- | mediagoblin/views.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mediagoblin/views.py b/mediagoblin/views.py index cd6aba9b..1e1db6c3 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -14,14 +14,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import sys - from mediagoblin import mg_globals from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.response import render_to_response from mediagoblin.db.util import DESCENDING from mediagoblin.decorators import uses_pagination -from mediagoblin import media_types @@ -36,8 +33,7 @@ def root_view(request, page): request, 'mediagoblin/root.html', {'media_entries': media_entries, 'allow_registration': mg_globals.app_config["allow_registration"], - 'pagination': pagination, - 'sys': sys}) + 'pagination': pagination}) def simple_template_render(request): |