From 6505df272458ce859c0c1031c31305a26805cca6 Mon Sep 17 00:00:00 2001 From: Gabriel Gomes Date: Thu, 14 Apr 2016 15:22:07 -0300 Subject: [PATCH 1/3] Added framworks PHP - Laravel and CakePHP --- free-programming-books-pt_BR.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/free-programming-books-pt_BR.md b/free-programming-books-pt_BR.md index 9298b9d0..96f7a541 100644 --- a/free-programming-books-pt_BR.md +++ b/free-programming-books-pt_BR.md @@ -84,6 +84,8 @@ ### Php * [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) * [PHP Do jeito certo](http://br.phptherightway.com/) +* [Laravel - O Framework PHP para os Artesãos da Web](http://laravel.artesaos.org/) +* [CakePHP](http://book.cakephp.org/2.0/pt/index.html) ### Python From 3e0bfbaea893dfe49d6a0f1a4a965b1d0bb135ce Mon Sep 17 00:00:00 2001 From: Gabriel Gomes Date: Tue, 19 Apr 2016 00:06:49 -0300 Subject: [PATCH 2/3] Avoiding merge conflicts --- free-programming-books-pt_BR.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/free-programming-books-pt_BR.md b/free-programming-books-pt_BR.md index f975088e..29414f17 100644 --- a/free-programming-books-pt_BR.md +++ b/free-programming-books-pt_BR.md @@ -125,21 +125,17 @@ ### Perl -* [Perl Básico](https://github.com/HeitorG/Perl-Brasil/blob/master/apostilas/perl-basico.pdf) - Heitor Gouvea (PDF) +* [Perl Básico](https://github.com/HeitorG/Perl-Brasil/blob/master/apostilas/perl-basico.pdf) - Heitor Gouvea (PDF) ### Php -<<<<<<< HEAD * [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) * [PHP Do jeito certo](http://br.phptherightway.com/) * [Laravel - O Framework PHP para os Artesãos da Web](http://laravel.artesaos.org/) * [CakePHP](http://book.cakephp.org/2.0/pt/index.html) -======= - * [A semana PHP](http://asemanaphp.com.br). * [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) (PDF) * [PHP Do jeito certo](http://br.phptherightway.com) ->>>>>>> upstream/master ### Python From 4d190af128ed7a14646f08f9ea63d0ec489ac49d Mon Sep 17 00:00:00 2001 From: Gabriel Gomes Date: Tue, 19 Apr 2016 13:58:02 -0300 Subject: [PATCH 3/3] Build travis CI --- free-programming-books-pt_BR.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/free-programming-books-pt_BR.md b/free-programming-books-pt_BR.md index 29414f17..c70a7227 100644 --- a/free-programming-books-pt_BR.md +++ b/free-programming-books-pt_BR.md @@ -128,13 +128,12 @@ * [Perl Básico](https://github.com/HeitorG/Perl-Brasil/blob/master/apostilas/perl-basico.pdf) - Heitor Gouvea (PDF) -### Php -* [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) -* [PHP Do jeito certo](http://br.phptherightway.com/) -* [Laravel - O Framework PHP para os Artesãos da Web](http://laravel.artesaos.org/) +### PHP + +* [A semana PHP](http://asemanaphp.com.br) * [CakePHP](http://book.cakephp.org/2.0/pt/index.html) -* [A semana PHP](http://asemanaphp.com.br). * [Curso Linguagem PHP 2000](http://www.etelg.com.br/paginaete/downloads/informatica/php.pdf) (PDF) +* [Laravel - O Framework PHP para os Artesãos da Web](http://laravel.artesaos.org) * [PHP Do jeito certo](http://br.phptherightway.com)