Merge branch 'master' into release/v.1.1.6

viniciuslagedo · Dec 22, 2017 · 11ac106 · 11ac106
2 parents 498d982 + 1a656ae
commit 11ac106
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ git checkout -b hotfix/name
 
 4. Wait for approbation or new comments about your pull request.
 
-## Only for collaborators
+## Only for contributors
 
 ### New version/release
 
@@ -52,6 +52,6 @@ gulp build:prod
 
 5. Wait for approbation or new comments about your pull request.
 
-6. After approving, create a new git-tag and release-branch on github and publish whole repository, including the dist folder, on [NPM](https://www.npmjs.com/) services.
+6. After approving, create a new git-tag and release-markup on github and publish whole repository, including the dist folder, on [NPM](https://www.npmjs.com/) services.
 
-7. Then make a merge from develop-branch to master-branch
+7. Then make a merge from master-branch to develop-branch
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-midnight