Merge branch 'alfonso-cabrera-patch-1'

pull/1594/head
fwiffo 2015-09-03 22:04:09 -07:00
commit b9380dab8a
1 changed files with 2 additions and 0 deletions

View File

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