Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfr committed Nov 16, 2021
2 parents 45cb115 + 2ba5a38 commit 518ff45
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ Are you a dev with JS and node.js experience or willing to learn through contrib
### Policy

We will not tolerate any harmful conduct and aim to create a nice open source community space to work in.

### Pull requests

Please direct your PRs to the `development` branch.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bedrock",
"version": "1.39.0",
"version": "1.39.1",
"description": "Static site generator to easily make HTML prototypes",
"main": "gulpfile.js",
"scripts": {
Expand All @@ -11,15 +11,15 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/mono-company/bedrock.git"
"url": "git+https://github.com/usebedrock/bedrock.git"
},
"keywords": [],
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/mono-company/bedrock/issues"
"url": "https://github.com/usebedrock/bedrock/issues"
},
"homepage": "https://github.com/mono-company/bedrock#readme",
"homepage": "https://bedrockapp.org",
"devDependencies": {
"@babel/core": "^7.14.6",
"@babel/preset-env": "^7.14.5",
Expand Down

0 comments on commit 518ff45

Please sign in to comment.