Skip to content

Commit

Permalink
Merge pull request #622 from ansble/Paris–Brussels-5.x.x
Browse files Browse the repository at this point in the history
Paris–brussels 5.3.0
  • Loading branch information
designfrontier committed Aug 8, 2018
2 parents 3ecb0e3 + 6b2626b commit 3eb4f84
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 65 deletions.
17 changes: 16 additions & 1 deletion history.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
### - 5.2.0 * 2018-8-7 22:44:47 *
### - 5.3.0 * 2018-8-7 23:28:12 *

- update lock file
- Merge pull request #621 from ansble/greenkeeper/ws-6.0.0
- Merge branch 'master' into greenkeeper/ws-6.0.0
- Merge pull request #615 from ansble/greenkeeper/bufferutil-4.0.0
- Merge branch 'Paris–Brussels-5.x.x' into greenkeeper/bufferutil-4.0.0
- Merge pull request #618 from ansble/greenkeeper/iltorb-2.4.0
- updated the lock
- Merge pull request #609 from ansble/Paris–Brussels-5.x.x
- fix(package): update iltorb to version 2.4.0
- fix(package): update ws to version 6.0.0
- chore(package): update bufferutil to version 4.0.0


### - 5.2.0 * 2018-8-7 22:44:47 *

- updated lock
- Merge pull request #619 from ansble/greenkeeper/utf-8-validate-5.0.1
Expand Down
93 changes: 33 additions & 60 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monument",
"version": "5.2.0",
"version": "5.3.0",
"description": "evented routing for nodejs for use on the server and in the client. Isomorphic!",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -52,7 +52,7 @@
"glob": "7.1.2",
"harken": "1.2.19",
"html-entities": "^1.2.1",
"iltorb": "2.3.2",
"iltorb": "2.4.0",
"lodash.clonedeep": "4.5.0",
"lodash.pick": "4.4.0",
"media-typer": "0.3.0",
Expand All @@ -63,7 +63,7 @@
"raw-body": "2.3.3",
"striptags": "^3.1.1",
"uuid": "3.3.2",
"ws": "5.2.1"
"ws": "6.0.0"
},
"devDependencies": {
"ava": "^1.0.0-beta.6",
Expand All @@ -85,7 +85,7 @@
"npm": ">5.0.0"
},
"optionalDependencies": {
"bufferutil": "3.0.5",
"bufferutil": "4.0.0",
"utf-8-validate": "5.0.1"
},
"ava": {
Expand Down

0 comments on commit 3eb4f84

Please sign in to comment.