Frontend Angular 4/src/app/layout/layout.module.ts · 3666bb6f91d4b212202215798e4d45a8792e96dc · Felipe Luis Parodi Viera / Frontend · GitLab

Snippets Groups Projects

Forked from matefun / Frontend

Source project has a limited visibility.

6 years ago
73c5a5eb
Merge branch 'feature/3DComponentInitialization' into feature/integration-graph-2d-3d · 73c5a5eb
jose.ignacio.fagian authored 6 years ago
```
# Conflicts:
#	Frontend Angular 4/src/app/app.module.ts
#	Frontend Angular 4/src/app/shared/config.ts
```
73c5a5eb

History
Merge branch 'feature/3DComponentInitialization' into feature/integration-graph-2d-3d
jose.ignacio.fagian authored 6 years ago
```
# Conflicts:
#	Frontend Angular 4/src/app/app.module.ts
#	Frontend Angular 4/src/app/shared/config.ts
```