Merge branch 'master' into master

kognate · web-flow · commit 9c20faec952a · 2017-02-23T16:07:08.000-05:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.24.0
+current_version = 0.25.0
 commit = True
 tag = True
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change Log
 ==========
 
+## Version 0.25.0
+
+_2017-02-23_
+
+* Fixed: Natural Language Understanding importing
+* Added: Conversation workspace updating
+
 ## Version 0.24.0
 
 _2017-02-21_
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = '0.24.0'
+__version__ = '0.25.0'
 
 if sys.argv[-1] == 'publish':
     # test server
diff --git a/watson_developer_cloud/version.py b/watson_developer_cloud/version.py
@@ -1 +1 @@
-__version__ = '0.24.0'
+__version__ = '0.25.0'
