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

Explorar o código

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

Conflicts:
	free-programming-books-tr.md

fwiffo %!s(int64=10) %!d(string=hai) anos

pai

f9105c410c f4464aa156

achega

da6f436189

Modificáronse 1 ficheiros con 2 adicións e 0 borrados

Dividir vista Mostrar estatísticas de Diff

						
							+ 2
							
							- 0
						
free-programming-books-tr.md
							 
								Ver ficheiro
							
				@@ -19,8 +19,10 @@
			
				 * [R](#r)
			
				 * [Ruby](#ruby)
			
				 * [Rust](#rust)
			
				+<<<<<<< HEAD
			
				 * [Swift](#swift)
			
				 * [Windows Phone](#windowsphone)
			
				+=======
			
				 ### Android