Skip to content

Commit

Permalink
Merge pull request #83 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Apr 15, 2019
2 parents 583342a + 573845f commit 12dfa51
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
16 changes: 15 additions & 1 deletion .roboconfig.json
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
{}
{
"@blackflux/robo-config-plugin": {
"tasks": [
"assorted/@npm-opensource"
],
"variables": {
"repoKey": "blackflux/robo-config-plugin",
"packageName": "@blackflux/robo-config-plugin",
"projectName": "robo-config-plugin",
"owner": "simlu",
"ownerName": "Lukas Siemon",
"mergeBot": "MrsFlux"
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@babel/plugin-proposal-object-rest-spread": "7.4.3",
"@babel/register": "7.4.0",
"@blackflux/eslint-plugin-rules": "1.0.2",
"@blackflux/robo-config-plugin": "1.4.0",
"@blackflux/robo-config-plugin": "1.4.1",
"babel-eslint": "10.0.1",
"chai": "4.2.0",
"coveralls": "3.0.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@
dependencies:
smart-fs "1.6.1"

"@blackflux/robo-config-plugin@1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-1.4.0.tgz#ec4cb2966236d8e197a8f0acbae7b79983007b76"
integrity sha512-igAsa2tuPgcwPY7Ttrv3b9BKJgZzj6C9TRhD6/BYWjgW2QiBGwO2ESvFU3eCWp9XbyM1l5K9YvTlYcB9b0mm/A==
"@blackflux/robo-config-plugin@1.4.1":
version "1.4.1"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-1.4.1.tgz#ffd1649b7b095be59e4829cd0a9bc44fbec0e92f"
integrity sha512-oDXp/ltwaoiuZwzZCe0rdnMVX3MCMblr8J5sls2k62di728hG+wwgp/idbXIshs70b5dXuvAv+sjP7XrcuNPZA==

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
Expand Down

0 comments on commit 12dfa51

Please sign in to comment.