Skip to content

Commit

Permalink
Merge branch 'release/3.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
maoberlehner committed Apr 29, 2016
2 parents 36cc70c + 2c278da commit 522f92a
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
52 changes: 52 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
## Reporting Issues

Found a problem? Want a new feature?

- See if your issue or idea has [already been reported].
- Provide a [reduced test case] or a [live example].

Remember, a bug is a _demonstrable problem_ caused by _our_ code.

## Submitting Pull Requests

Pull requests are the greatest contributions, so be sure they are focused in scope, and do avoid unrelated commits.

1. To begin, [fork this project], clone your fork, and add our upstream.
```bash
# Clone your fork of the repo into the current directory
git clone https://github.com/<your-username>/avalanche
# Navigate to the newly cloned directory
cd avalanche
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/avalanchesass/avalanche
# Install the tools necessary for development
npm install
```

2. Create a branch for your feature or hotfix:
```bash
# Move into a new branch for a feature
git checkout -b feature/thing
```
```bash
# Move into a new branch for a hotfix
git checkout -b hotfix/something
```

3. Push your branch up to your fork:
```bash
# Push a feature branch
git push origin feature/thing
```
```bash
# Push a hotfix branch
git push origin hotfix/something
```

4. Now [open a pull request] with a clear title and description.

[already been reported]: https://github.com/avalanchesass/avalanche/issues
[fork this project]: https://github.com/avalanchesass/avalanche/fork
[live example]: http://codepen.io/pen
[open a pull request]: https://help.github.com/articles/using-pull-requests/
[reduced test case]: https://css-tricks.com/reduced-test-cases/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": [
"avalanchesass-package"
],
"version": "3.0.4",
"version": "3.0.5",
"author": "Markus Oberlehner",
"homepage": "https://github.com/avalanchesass/avalanche",
"license": "GPL v2",
Expand Down

0 comments on commit 522f92a

Please sign in to comment.