Merge branch 'patch-1' of git://github.com/alfonso-cabrera/free-programming-books into alfonso-cabrera-patch-1

Conflicts:
	free-programming-books-tr.md
This commit is contained in:
fwiffo 2015-09-03 22:03:42 -07:00
commit da6f436189

View File

@ -19,8 +19,10 @@
* [R](#r) * [R](#r)
* [Ruby](#ruby) * [Ruby](#ruby)
* [Rust](#rust) * [Rust](#rust)
<<<<<<< HEAD
* [Swift](#swift) * [Swift](#swift)
* [Windows Phone](#windowsphone) * [Windows Phone](#windowsphone)
=======
### Android ### Android