Skip to content

Commit

Permalink
Update CONTRIBUTING notes to reflect the changes for git-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
mynetx committed Jun 23, 2013
1 parent 753d457 commit 17e88c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Which branch?
- Bugs are fixed in the latest QA_* branch, please base your bugfix pull requests on this branch.
- New features are added to the master branch, please base your feature-add pull requests on that branch.
- Bugs are fixed in the master branch, please base your bugfix pull requests on this branch.
- New features are added to the develop branch, please base your feature-add pull requests on that branch.

### Code style
- Please use 4 soft spaces per indent level.
Expand Down

0 comments on commit 17e88c1

Please sign in to comment.