diff rhodecode/controllers/branches.py @ 2109:8ecfed1d8f8b beta

utils/conf - created temporary utils2 - made config.conf for storing some configurations - fixed some dependency import problems - code cleanup - rc-extensions now properly work for celery
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 07 Mar 2012 02:18:22 +0200
parents 89efedac4e6c
children dc2584ba5fbc a07e04ef7bb4
line wrap: on
line diff
--- a/rhodecode/controllers/branches.py	Wed Mar 07 00:27:43 2012 +0200
+++ b/rhodecode/controllers/branches.py	Wed Mar 07 02:18:22 2012 +0200
@@ -31,7 +31,7 @@
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.compat import OrderedDict
-from rhodecode.lib import safe_unicode
+from rhodecode.lib.utils2 import safe_unicode
 log = logging.getLogger(__name__)