Merge branch 'master' into develop

# Conflicts: # sqlalchemy_fsm/__init__.py
VRGhost · Jan 31, 2018 · accddeb · accddeb
2 parents 0833ba4 + 966eb3d
commit accddeb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.7
+current_version = 2.0.0
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def get_readme():
         'Topic :: Database',
     ],
     keywords='sqlalchemy finite state machine fsm',
-    version='1.1.7',
+    version='2.0.0',
     url='https://github.com/VRGhost/sqlalchemy-fsm',
     install_requires=[
         'SQLAlchemy>=1.0.0',

diff --git a/sqlalchemy_fsm/__init__.py b/sqlalchemy_fsm/__init__.py
@@ -7,4 +7,4 @@
 
 from .transition import transition
 
-__version__ = '1.1.7'
+__version__ = '2.0.0'