Fixing merge issue and updating release number

This commit is contained in:
azhebel
2015-08-28 12:55:39 +03:00
parent f2b33773b6
commit a2b966fa24
2 changed files with 1 additions and 3 deletions

View File

@@ -50,7 +50,7 @@ copyright = u'2015, Percona LLC and/or its affiliates'
# The short X.Y version.
version = '2.2'
# The full version, including alpha/beta/rc tags.
release = '2.2.14'
release = '2.2.15'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.