{"push_id":997724201,"size":4,"distinct_size":1,"ref":"refs/heads/rudy","head":"acadd3287b46f40436ac79ba985b974dd30f3e43","before":"4850ee25e0048946c35889494bb47ce9ec20e599","commits":[{"sha":"21aca6075cfdfb80cd521251b4f2103105e067b3","author":{"email":"e756f11cbfde2f5f2415759b2b4b97a9530f98f0@hotmail.com","name":"Czunigahn"},"message":"TEST","distinct":false,"url":"https://api.github.com/repos/Javier3131/ProyectoDAW/commits/21aca6075cfdfb80cd521251b4f2103105e067b3"},{"sha":"c9db0e4450c1b2edac889a34f27b91b0548c1dcc","author":{"email":"84358d428a29b71a83893d4ccbf534fa59a67706@gmail.com","name":"Javier Lopez"},"message":"Cambios en la vista le articulos. Agregando campo de imagen en el modelo de articulos. Agregando imagen por defecto de articulo. Agregando app key y app secret de facebook. Haciendo relajos en el modelo y controlador de usuario para agregar foto de perfil.","distinct":false,"url":"https://api.github.com/repos/Javier3131/ProyectoDAW/commits/c9db0e4450c1b2edac889a34f27b91b0548c1dcc"},{"sha":"71ead4e56b0f7d0d923fc8d799316a78dcecc4e8","author":{"email":"e756f11cbfde2f5f2415759b2b4b97a9530f98f0@hotmail.com","name":"Christopher Zuniga"},"message":"Merge branch 'crist' of https://github.com/Javier3131/ProyectoDAW","distinct":false,"url":"https://api.github.com/repos/Javier3131/ProyectoDAW/commits/71ead4e56b0f7d0d923fc8d799316a78dcecc4e8"},{"sha":"acadd3287b46f40436ac79ba985b974dd30f3e43","author":{"email":"ccad6b336dfc0b118c8776dc9c3d6117183eb220@unitec.edu","name":"rlopez05"},"message":"Merge branch 'master' of https://github.com/Javier3131/ProyectoDAW into rudy\n\n# Conflicts:\n#\tnode_modules/angular-file-upload/.jshintrc\n#\tnode_modules/angular-file-upload/.npmignore\n#\tnode_modules/angular-file-upload/README.md\n#\tnode_modules/angular-file-upload/bower.json\n#\tnode_modules/angular-file-upload/dist/angular-file-upload.js\n#\tnode_modules/angular-file-upload/examples/console-sham.js\n#\tnode_modules/angular-file-upload/examples/console-sham.min.js\n#\tnode_modules/angular-file-upload/examples/image-preview/controllers.js\n#\tnode_modules/angular-file-upload/examples/image-preview/directives.js\n#\tnode_modules/angular-file-upload/examples/image-preview/index.html\n#\tnode_modules/angular-file-upload/examples/image-preview/upload.php\n#\tnode_modules/angular-file-upload/examples/simple/controllers.js\n#\tnode_modules/angular-file-upload/examples/simple/index.html\n#\tnode_modules/angular-file-upload/examples/simple/upload.php\n#\tnode_modules/angular-file-upload/examples/without-bootstrap/controllers.js\n#\tnode_modules/angular-file-upload/examples/without-bootstrap/directives.js\n#\tnode_modules/angular-file-upload/examples/without-bootstrap/index.html\n#\tnode_modules/angular-file-upload/examples/without-bootstrap/style.css\n#\tnode_modules/angular-file-upload/examples/without-bootstrap/upload.php\n#\tnode_modules/angular-file-upload/gulpfile.js\n#\tnode_modules/angular-file-upload/license.txt\n#\tnode_modules/angular-file-upload/package.json\n#\tnode_modules/angular-file-upload/src/config.json\n#\tnode_modules/angular-file-upload/src/directives/FileDrop.js\n#\tnode_modules/angular-file-upload/src/directives/FileOver.js\n#\tnode_modules/angular-file-upload/src/directives/FileSelect.js\n#\tnode_modules/angular-file-upload/src/index.js\n#\tnode_modules/angular-file-upload/src/services/FileDirective.js\n#\tnode_modules/angular-file-upload/src/services/FileDrop.js\n#\tnode_modules/angular-file-upload/src/services/FileItem.js\n#\tnode_modules/angular-file-upload/src/services/FileLikeObject.js\n#\tnode_modules/angular-file-upload/src/services/FileOver.js\n#\tnode_modules/angular-file-upload/src/services/FileSelect.js\n#\tnode_modules/angular-file-upload/src/services/FileUploader.js\n#\tnode_modules/angular-file-upload/src/values/options.js","distinct":true,"url":"https://api.github.com/repos/Javier3131/ProyectoDAW/commits/acadd3287b46f40436ac79ba985b974dd30f3e43"}]}