Merge branch 'pre_master' into LucasRama (61300d77) · Commits · Juan José Álvarez Pérez / UyTube_obligatorio_PdA · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

UyTube_obligatorio_PdA
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

61300d77

Commit 61300d77 authored 5 years ago by Lucas Garrido

Downloads
- Plain Diff

Merge branch 'pre_master' into LucasRama

parents b9b7240c 0c779852

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

UyTube_logica/src/Logica/Clases/Video.java 19 additions, 4 deletions

UyTube_logica/src/Logica/Clases/Video.java
UyTube_web/libreria/UyTube_logica.jar 0 additions, 0 deletions

UyTube_web/libreria/UyTube_logica.jar
UyTube_web/src/java/com/uytube/Buscar.java 1 addition, 0 deletions

UyTube_web/src/java/com/uytube/Buscar.java
UyTube_web/web/ConsultaUsuario.jsp 7 additions, 5 deletions

UyTube_web/web/ConsultaUsuario.jsp
UyTube_web/web/ConsultaVideo.jsp 31 additions, 12 deletions

UyTube_web/web/ConsultaVideo.jsp
datos_de_prueba.sql 18 additions, 18 deletions

datos_de_prueba.sql

with 76 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment