Merge branch 'master' into mng/feature-parsing

optimizely · May 31, 2017 · 8e69760 · 8e69760
2 parents b4de51c + de81f79
commit 8e69760
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.2.0
+- Added user profile service.
+
 # 1.1.1
 - Updated datafile parsing to be able to handle additional fields.
 - Deprecated Classic project support.

diff --git a/optimizely/version.py b/optimizely/version.py
@@ -11,5 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version_info = (1, 1, 1)
+version_info = (1, 2, 0)
 __version__ = '.'.join(str(v) for v in version_info)