Permalink
Browse files

Merge branch 'master' of github.com:intridea/tweetstream

Conflicts:
	README.md
  • Loading branch information...
2 parents faaf155 + 9e9d063 commit d6b4cf8c2d445f363d366dd5ae0436f08c9ff3ac @stve stve committed Oct 7, 2012
Showing with 9 additions and 8 deletions.
  1. +9 −0 CONTRIBUTING.md
  2. +0 −8 README.md
View
@@ -0,0 +1,9 @@
+## Contributing
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version
+ unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have
+ your own version, that is fine but bump version in a commit by itself I can
+ ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
View
@@ -334,14 +334,6 @@ To access the Twitter REST API, we recommend the [Twitter][] gem.
[twitter]: https://github.com/sferik/twitter
-## Contributing
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
## Contributors
* [Michael Bleigh](https://github.com/mbleigh) (initial gem)

0 comments on commit d6b4cf8

Please sign in to comment.