Merge branch 'release/1.2.0' into develop

lindsayevans · Jan 31, 2018 · cf363a8 · cf363a8
2 parents 2eb9b50 + 505e648
commit cf363a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/outline.js b/outline.js
@@ -1,4 +1,4 @@
-/*! outline.js - https://github.com/lindsayevans/outline.js/ */
+/*! outline.js v1.2.0 - https://github.com/lindsayevans/outline.js/ */
 (function(d){
 
 	var style_element = d.createElement('STYLE'),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "outline.js",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "outline.js",
   "repository": "https://github.com/lindsayevans/outline.js",
   "author": "Lindsay Evans <linz@linz.id.au>",