Commits

Marcin Kuzminski  committed 5221734 Merge

merge default into demo

  • Participants
  • Parent commits 0a7c466, fa74e91
  • Branches demo

Comments (0)

Files changed (3)

File docs/changelog.rst

 =========
 
 
-1.3.0 (**2012-02-XX**)
+1.3.0 (**2012-02-26**)
 ----------------------
 
-:status: in-progress
-:branch: beta
-
 news
 ++++
 

File rhodecode/__init__.py

 import sys
 import platform
 
-VERSION = (1, 3, 0)
+VERSION = (1, 3, 1)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()

File rhodecode/lib/__init__.py

     :returns: str object
     """
     
+    # if it's not basestr cast to str
     if not isinstance(unicode_, basestring):
         return str(unicode_)