Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 550_Setup_heroku_we…
Browse files Browse the repository at this point in the history
…bworkers
  • Loading branch information
alexeykosinski committed Dec 17, 2019
2 parents 1d8c1b7 + 559edc8 commit 1b2b793
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 16 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v0.11.1](https://github.com/GoodDollar/GoodServer/compare/v0.11.0...v0.11.1)

> 17 December 2019
- add: reset production contracts alphav3 [`8cd92e5`](https://github.com/GoodDollar/GoodServer/commit/8cd92e5eeb798a084e053e17254c8d5dafbcc15c)
- add: update contracts solve travis issue [`b8dedd7`](https://github.com/GoodDollar/GoodServer/commit/b8dedd7254818f992cdceb1040388b637b4edc29)
- add: disable w3 and market for alpha [`f59838c`](https://github.com/GoodDollar/GoodServer/commit/f59838c13122e9d0800226b6a4787544ac6f0e25)

#### [v0.11.0](https://github.com/GoodDollar/GoodServer/compare/v0.11.0-1...v0.11.0)

> 16 December 2019
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@gooddollar/goodserver",
"version": "0.11.0",
"version": "0.11.1",
"description": "GoodDollar Server",
"main": "src/server/index.js",
"engines": {
Expand Down Expand Up @@ -43,7 +43,7 @@
"homepage": "https://gooddollar.org",
"dependencies": {
"@babel/polyfill": "^7.4.4",
"@gooddollar/goodcontracts": "^1.0.0-beta.17",
"@gooddollar/goodcontracts": "^1.0.0-beta.19",
"@sendgrid/mail": "^6.4.0",
"apidoc": "^0.17.7",
"apidoc-markdown": "^0.2.1",
Expand Down

0 comments on commit 1b2b793

Please sign in to comment.