Skip to content

Commit

Permalink
Merge branch release-1.0.7 into master.
Browse files Browse the repository at this point in the history
  • Loading branch information
flatheadmill committed Nov 17, 2017
2 parents bd9bfe6 + d5c57e9 commit b6254b3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
@@ -1,5 +1,7 @@
- Version 1.0.7.

Fri Nov 17 07:50:56 UTC 2017

* Upgrade IANA TZ Database to `2016g`. #278.
* Do not change input date array. #276.

Expand Down
2 changes: 1 addition & 1 deletion 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.6",
"version": "1.0.7",
"author": "Alan Gutierrez <alan@prettyrobots.com>",
"keywords": [ "time", "timezone", "date", "clock", "wall-clock",
"tzdata", "utc", "gmt", "datetime", "tz", "format",
Expand Down
2 changes: 1 addition & 1 deletion src/timezone.js
Expand Up @@ -109,7 +109,7 @@
}

function convert (vargs) {
if (!vargs.length) return "1.0.6";
if (!vargs.length) return "1.0.7";

var request = Object.create(this)
, adjustments = []
Expand Down
2 changes: 1 addition & 1 deletion t/version/get.t.js
Expand Up @@ -2,5 +2,5 @@ require('proof')(1, prove)

function prove (assert) {
var tz = require('timezone'), util = require('../util')
assert(tz(), '1.0.6', 'get')
assert(tz(), '1.0.7', 'get')
}

0 comments on commit b6254b3

Please sign in to comment.