Commit 95cd950e authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch 'bump_to_v1.2' into 'master' 

Bump version number to v1.2.0

See merge request !73
parents 2015f2af 5307da0a

doc/source/conf.py

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ author = 'Andrew Quinn, Mark Hymers' 
# built documents.

#

# The short X.Y version.

version = '1.1'

version = '1.2'

# The full version, including alpha/beta/rc tags.

release = '1.1.1'

release = '1.2.0'



# The language for content autogenerated by Sphinx. Refer to documentation

# for a list of supported languages.

setup.py

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ with open(path.join(this_directory, 'README.rst'), encoding='utf-8') as f: 
    long_description = f.read()



name = 'sails'

version = '1.1'

release = '1.1.1'

version = '1.2'

release = '1.2.0'



setup(

    name=name,