Commit 4dc37e1e authored by jose.ignacio.fagian's avatar jose.ignacio.fagian
Browse files

Merge branch 'feature/integration-graph-2d-3d' of...

Merge branch 'feature/integration-graph-2d-3d' of https://gitlab.fing.edu.uy/matefun/Frontend into feature/integration-graph-2d-3d

# Conflicts:
#	Frontend Angular 4/package.json
#	Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
parents c8df5c9b c39e6782
Pipeline #3028 failed with stages
in 32 seconds