Skip to content

Commit

Permalink
Merge pull request #327 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 11, 2019
2 parents 45f8ec3 + 1e10c7a commit 5ecd77e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"chai": "4.2.0",
"coveralls": "3.0.6",
"eslint": "6.1.0",
"js-gardener": "2.0.59",
"js-gardener": "2.0.61",
"nyc": "14.1.1",
"semantic-release": "15.13.19",
"tmp": "0.1.0"
Expand Down Expand Up @@ -105,7 +105,7 @@
"json-stringify-pretty-compact": "2.0.0",
"lodash.clonedeep": "4.5.0",
"lodash.isequal": "4.5.0",
"object-align": "1.0.2",
"object-align": "1.0.3",
"xml-js": "1.6.11",
"yaml-boost": "1.9.11"
}
Expand Down
23 changes: 14 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3554,10 +3554,10 @@ joi-strict@1.0.4:
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.4.tgz#8bf55f7b4d6accd5b530ac98276131b59e982254"
integrity sha512-ChSFFa+Z3iD9x9QsBFMEHwXrwt2Gq2OD1fg+Mgje1Tx+Pqt7ma+LXgMdzVoC7GHCxhO3ySDVBtDumES/yycMXg==

js-gardener@2.0.59:
version "2.0.59"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.59.tgz#d4f0ecdfb387403b4fc4e4ee0aa956be1ea0b29e"
integrity sha512-cRFWSkHQ/bs5VmEVPkjOKU2oaFd7ynuKC37jeN9vwzYP4lDbJI9pC7gHv4T9j2gqiKw8g7nWPncgle4haA6wHQ==
js-gardener@2.0.61:
version "2.0.61"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.61.tgz#58ed898eb4ee542e10fc5fc9603fd7d9efd4d048"
integrity sha512-yfZ3JXkN+kQThbG6PYndOfO/1z/wE5LxbTjhH3LFtnyZXKv18NWkiTB9tFEMtVvq+l/d6i34NJ/9A/h0MW1Wsg==
dependencies:
"@hapi/joi" "15.1.0"
chalk "2.4.2"
Expand All @@ -3576,7 +3576,7 @@ js-gardener@2.0.59:
lodash.get "4.4.2"
mocha "6.2.0"
npm-check "5.9.0"
robo-config "3.1.1"
robo-config "3.1.2"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -4950,6 +4950,11 @@ object-align@1.0.2:
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.2.tgz#14f003e9a50fbe18acb79b736b655924a06a5ade"
integrity sha512-YNGCcw5RcGCDpehATXUGvg0ZNJ9cPz0TtnhIvDYO3IlB304ps+T5S5KlkiA8NCn/d212BwkARuxC4RVQQxQtfg==

object-align@1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.3.tgz#5951029ebfb80356261e154061a5ae39a6442fb9"
integrity sha512-u3wXpnjiIniv0QntVOCzP1OSqtPbvye1Dr5/FoVzlfGMlte1j5Njq2plNvlmzYX5HwR/uGAxgdRlmMkO6DiN/g==

object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
Expand Down Expand Up @@ -6106,10 +6111,10 @@ rimraf@2, rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6
dependencies:
glob "^7.1.3"

robo-config@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.1.1.tgz#0311d56d4b679296c5d497d3de057f18fa2090b9"
integrity sha512-3GPWn0dxqoObwbxl1J8DQE4p8nOp9f8CH6NQa3dXS7Dlgbhpf4s8LUr24fuKtRea0TT7kWAbotrfZsw+5Z6ozQ==
robo-config@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.1.2.tgz#ef69bc53ef4416801778b30aa105417eef33d13f"
integrity sha512-kCVzK+6juQNkPCOPyUvHD/tEtcUw8tVYTVkUK0hN5BRFLTN2RYmJHxTGVC+6lsSbFO/rzPwfvwOXoYkLfSB+Rw==
dependencies:
"@hapi/joi" "15.1.0"
app-root-path "2.2.1"
Expand Down

0 comments on commit 5ecd77e

Please sign in to comment.