Mercurial > kallithea
changeset 2033:abe75448253c
merged beta into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 26 Feb 2012 18:09:28 +0200 |
parents | 82a88013a3fd (current diff) 950110f3f99f (diff) |
children | 65e2ecfc433d |
files | docs/contributing.rst docs/theme/nature/layout.html rhodecode/lib/__init__.py |
diffstat | 2 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/theme/nature/layout.html Sun Feb 26 17:25:09 2012 +0200 +++ b/docs/theme/nature/layout.html Sun Feb 26 18:09:28 2012 +0200 @@ -10,9 +10,9 @@ border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"> </form> - <div style="padding:5px"> - <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> - <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> - </div> + <div style="padding:5px"> + <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> + <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> + </div> </div> {% endblock %}}
--- a/rhodecode/lib/__init__.py Sun Feb 26 17:25:09 2012 +0200 +++ b/rhodecode/lib/__init__.py Sun Feb 26 18:09:28 2012 +0200 @@ -235,9 +235,6 @@ if not isinstance(unicode_, basestring): return str(unicode_) - if not isinstance(unicode_, basestring): - return str(unicode_) - if isinstance(unicode_, str): return unicode_