Skip to content

Commit

Permalink
Merge branch 'master' into features/1134
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Tandler committed Nov 12, 2022
2 parents e4357dc + ee02e99 commit 5e5ffa5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

# 3.1.0 (2022-10-31)

* Add Duration.rescale

# 3.0.4 (2022-09-24)

* Fix quarters in diffs (#1279)
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "luxon",
"version": "3.0.4",
"version": "3.1.0",
"description": "Immutable date wrapper",
"author": "Isaac Cambron",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/luxon.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import InvalidZone from "./zones/invalidZone.js";
import SystemZone from "./zones/systemZone.js";
import Settings from "./settings.js";

const VERSION = "3.0.4";
const VERSION = "3.1.0";

export {
VERSION,
Expand Down

0 comments on commit 5e5ffa5

Please sign in to comment.