Merge branch 'develop' into 'crearBootcamp'
# Conflicts: # src/main/java/com/roshka/proyectofinal/ProtectedResource.java # src/main/webapp/index.html
Showing
src/main/webapp/imagenes/icon-email.svg
0 → 100644
src/main/webapp/imagenes/icon-location.ico
0 → 100644
File added
src/main/webapp/imagenes/icon-location.svg
0 → 100644
src/main/webapp/imagenes/icon-phone.svg
0 → 100644
src/main/webapp/imagenes/logo_footer.svg
0 → 100644
This diff is collapsed.
Click to expand it.
src/main/webapp/imagenes/social-fb.svg
0 → 100644
src/main/webapp/imagenes/social-ig.svg
0 → 100644
src/main/webapp/imagenes/social-linkedin.svg
0 → 100644
src/main/webapp/imagenes/social-twitter.svg
0 → 100644
src/main/webapp/login.jsp
0 → 100644
src/main/webapp/loginSuccess.jsp
0 → 100644
Please
register
or
sign in
to comment