Merge branch 'master' of github.com:oasis-open/cti-python-stix2

MISP · Mar 18, 2019 · 61e9fc0 · 61e9fc0
2 parents 28db2df + f8d4669
commit 61e9fc0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+1.1.2 - 2019-02-13
+
+* #86 Adds helper function to Location objects to generate a URL to the location in an online map engine.
+
 1.1.1 - 2019-01-11
 
 * #234 Update documentation structure to better navigate between v20/v21 objects

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.1
+current_version = 1.1.2
 commit = True
 tag = True
 

diff --git a/stix2/version.py b/stix2/version.py
@@ -1 +1 @@
-__version__ = "1.1.1"
+__version__ = "1.1.2"