parent: c61f4665 | patch | commit | ignore whitespace
Chris McDonough
2013-09-22 00c590bd7425565221f44b5f0e6eafe3e1fbd4b8 
Merge branch 'master' into 1.5-branch
2 files modified
9 ■■■■■ changed files
CHANGES.txt 4 ●●●●● patch | view | raw | blame | history
setup.py 5 ●●●●● patch | view | raw | blame | history 
 CHANGES.txt


@@ -1,5 +1,5 @@


Next Release


============


1.5a2 (2013-09-22)


==================




Features


--------




 setup.py


@@ -69,9 +69,8 @@


    ]




setup(name='pyramid',


      version='1.5a1',


      description=('The Pyramid Web Framework, a '


                   'Pylons project'),


      version='1.5a2',


      description='The Pyramid Web Framework, a Pylons project',


      long_description=README + '\n\n' +  CHANGES,


      classifiers=[


        "Intended Audience :: Developers",