Merge branch release-1.0.22 into master.

flatheadmill · flatheadmill · commit 03896c72becd · 2019-01-24T02:33:51.000-06:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 - Version 1.0.22.
 
+Thu Jan 24 08:32:11 UTC 2019
+
  * Upgrade IANA TZ Database for `2018i`. #316.
 
 - Version 1.0.21.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name":             "timezone",
     "description":      "Small, elegant, Olson educated, timezone aware date math and `strftime` date formatting in pure JavaScript with no dependendcies for Node.js and the browser. Timezone uses the Olson/IANA timezone database. Timezone is aware of every clock transition in the Olson database. Timezones supports the full compilment of `strftime` format specifiers defined by GNU `date`. Timezone can perform date math and adjust for daylight savings time. Timezone works in the browser too where it is less than 3K minified and gzipped.",
-    "version":              "1.0.21",
+    "version":              "1.0.22",
     "author":               "Alan Gutierrez <alan@prettyrobots.com>",
     "keywords":         [   "time", "timezone", "date", "clock", "wall-clock",
                             "tzdata", "utc", "gmt", "datetime", "tz", "format",
diff --git a/src/timezone.js b/src/timezone.js
@@ -109,7 +109,7 @@
   }
 
   function convert (vargs) {
-    if (!vargs.length) return "1.0.21";
+    if (!vargs.length) return "1.0.22";
 
     var request = Object.create(this)
       , adjustments = []
diff --git a/t/version/get.t.js b/t/version/get.t.js
@@ -2,5 +2,5 @@ require('proof')(1, prove)
 
 function prove (assert) {
     var tz = require('timezone'), util = require('../util')
-    assert(tz(), '1.0.21', 'get')
+    assert(tz(), '1.0.22', 'get')
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "timezone",`
`3`	`3`	"description": "Small, elegant, Olson educated, timezone aware date math and `strftime` date formatting in pure JavaScript with no dependendcies for Node.js and the browser. Timezone uses the Olson/IANA timezone database. Timezone is aware of every clock transition in the Olson database. Timezones supports the full compilment of `strftime` format specifiers defined by GNU `date`. Timezone can perform date math and adjust for daylight savings time. Timezone works in the browser too where it is less than 3K minified and gzipped.",
`4`		`- "version": "1.0.21",`
	`4`	`+ "version": "1.0.22",`
`5`	`5`	`"author": "Alan Gutierrez <alan@prettyrobots.com>",`
`6`	`6`	`"keywords": [ "time", "timezone", "date", "clock", "wall-clock",`
`7`	`7`	`"tzdata", "utc", "gmt", "datetime", "tz", "format",`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`function convert (vargs) {`
`112`		`- if (!vargs.length) return "1.0.21";`
	`112`	`+ if (!vargs.length) return "1.0.22";`
`113`	`113`
`114`	`114`	`var request = Object.create(this)`
`115`	`115`	`, adjustments = []`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ require('proof')(1, prove)`
`2`	`2`
`3`	`3`	`function prove (assert) {`
`4`	`4`	`var tz = require('timezone'), util = require('../util')`
`5`		`- assert(tz(), '1.0.21', 'get')`
	`5`	`+ assert(tz(), '1.0.22', 'get')`
`6`	`6`	`}`