Merge pull request redradix-school#1 from julianitor/master

adapted chapter 3 to express 4.x and renamed chapter 7 to 6
magranero · Feb 9, 2015 · 7e74248 · 7e74248
2 parents 071f8fd + 2bcd2f8
commit 7e74248
Show file tree

Hide file tree

Showing 26 changed files with 0 additions and 0 deletions.
diff --git a/soluciones/tema7/chat/app.js → soluciones/tema6/chat/app.js b/soluciones/tema7/chat/app.js → soluciones/tema6/chat/app.js
diff --git a/soluciones/tema7/chat/bin/start → soluciones/tema6/chat/bin/start b/soluciones/tema7/chat/bin/start → soluciones/tema6/chat/bin/start
diff --git a/soluciones/tema7/chat/npm-debug.log → soluciones/tema6/chat/npm-debug.log b/soluciones/tema7/chat/npm-debug.log → soluciones/tema6/chat/npm-debug.log
diff --git a/soluciones/tema7/chat/package.json → soluciones/tema6/chat/package.json b/soluciones/tema7/chat/package.json → soluciones/tema6/chat/package.json
diff --git a/...ema7/chat/public/assets/images/avatar.jpg → ...ema6/chat/public/assets/images/avatar.jpg b/...ema7/chat/public/assets/images/avatar.jpg → ...ema6/chat/public/assets/images/avatar.jpg
diff --git a/...sets/javascripts/libs/jquery-1.9.0.min.js → ...sets/javascripts/libs/jquery-1.9.0.min.js b/...sets/javascripts/libs/jquery-1.9.0.min.js → ...sets/javascripts/libs/jquery-1.9.0.min.js
diff --git a/...s/javascripts/libs/modernizr-2.6.1.min.js → ...s/javascripts/libs/modernizr-2.6.1.min.js b/...s/javascripts/libs/modernizr-2.6.1.min.js → ...s/javascripts/libs/modernizr-2.6.1.min.js
diff --git a/.../chat/public/assets/javascripts/script.js → .../chat/public/assets/javascripts/script.js b/.../chat/public/assets/javascripts/script.js → .../chat/public/assets/javascripts/script.js
diff --git a/...chat/public/assets/stylesheets/screen.css → ...chat/public/assets/stylesheets/screen.css b/...chat/public/assets/stylesheets/screen.css → ...chat/public/assets/stylesheets/screen.css
diff --git a/soluciones/tema7/chat/public/chat.html → soluciones/tema6/chat/public/chat.html b/soluciones/tema7/chat/public/chat.html → soluciones/tema6/chat/public/chat.html
diff --git a/soluciones/tema7/chat/public/code.js → soluciones/tema6/chat/public/code.js b/soluciones/tema7/chat/public/code.js → soluciones/tema6/chat/public/code.js
diff --git a/soluciones/tema7/chat/public/login.html → soluciones/tema6/chat/public/login.html b/soluciones/tema7/chat/public/login.html → soluciones/tema6/chat/public/login.html
diff --git a/tema3.pdf b/tema3.pdf
diff --git a/tema7.pdf → tema6.pdf b/tema7.pdf → tema6.pdf
diff --git a/tema7/chat/app.js → tema6/chat/app.js b/tema7/chat/app.js → tema6/chat/app.js
diff --git a/tema7/chat/bin/start → tema6/chat/bin/start b/tema7/chat/bin/start → tema6/chat/bin/start
diff --git a/tema7/chat/npm-debug.log → tema6/chat/npm-debug.log b/tema7/chat/npm-debug.log → tema6/chat/npm-debug.log
diff --git a/tema7/chat/package.json → tema6/chat/package.json b/tema7/chat/package.json → tema6/chat/package.json
diff --git a/tema7/chat/public/assets/images/avatar.jpg → tema6/chat/public/assets/images/avatar.jpg b/tema7/chat/public/assets/images/avatar.jpg → tema6/chat/public/assets/images/avatar.jpg
diff --git a/...sets/javascripts/libs/jquery-1.9.0.min.js → ...sets/javascripts/libs/jquery-1.9.0.min.js b/...sets/javascripts/libs/jquery-1.9.0.min.js → ...sets/javascripts/libs/jquery-1.9.0.min.js
diff --git a/...s/javascripts/libs/modernizr-2.6.1.min.js → ...s/javascripts/libs/modernizr-2.6.1.min.js b/...s/javascripts/libs/modernizr-2.6.1.min.js → ...s/javascripts/libs/modernizr-2.6.1.min.js
diff --git a/.../chat/public/assets/javascripts/script.js → .../chat/public/assets/javascripts/script.js b/.../chat/public/assets/javascripts/script.js → .../chat/public/assets/javascripts/script.js
diff --git a/...chat/public/assets/stylesheets/screen.css → ...chat/public/assets/stylesheets/screen.css b/...chat/public/assets/stylesheets/screen.css → ...chat/public/assets/stylesheets/screen.css
diff --git a/tema7/chat/public/chat.html → tema6/chat/public/chat.html b/tema7/chat/public/chat.html → tema6/chat/public/chat.html
diff --git a/tema7/chat/public/code.js → tema6/chat/public/code.js b/tema7/chat/public/code.js → tema6/chat/public/code.js
diff --git a/tema7/chat/public/login.html → tema6/chat/public/login.html b/tema7/chat/public/login.html → tema6/chat/public/login.html