Merge remote-tracking branch 'upstream/master'

Conflicts:
	free-programming-books-es.md
	free-programming-books-ru.md
	free-programming-interactive-tutorials-en.md
This commit is contained in:
matysanchez
2014-01-18 14:23:50 -03:00
parent 5ea0a6bb2b
commit 5db348c64a
6 changed files with 268 additions and 76 deletions

View File

@ -13,7 +13,7 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Pl
- Read the [TODO](/TODO.md) file(Adding new books is our #1 priority, but things like Alphabetizing are important, too.)
- Edit (we prefer multiple small commits rather than one large change)
- [Send a PR](https://help.github.com/articles/using-pull-requests)
- be part of a project that over 16,000 people starred in 3 months. ;)
- be part of a project that over 17,000 people starred in 4 months. ;)
**Again, unlike other projects, we prefer multiple small commits rather than one large change in a pull request - it's fine to have one PR, but please make sure your title reflects what you're changing**, thanks.