comparison rhodecode/controllers/feed.py @ 2165:dc2584ba5fbc

merged beta into default branch
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 28 Mar 2012 19:54:16 +0200
parents 82a88013a3fd 8ecfed1d8f8b
children 63e58ef80ef1
comparison
equal deleted inserted replaced
2097:8fd6650bb436 2165:dc2584ba5fbc
26 import logging 26 import logging
27 27
28 from pylons import url, response, tmpl_context as c 28 from pylons import url, response, tmpl_context as c
29 from pylons.i18n.translation import _ 29 from pylons.i18n.translation import _
30 30
31 from rhodecode.lib import safe_unicode 31 from rhodecode.lib.utils2 import safe_unicode
32 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator 32 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
33 from rhodecode.lib.base import BaseRepoController 33 from rhodecode.lib.base import BaseRepoController
34 34
35 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed 35 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
36 36