aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_pages/test
diff options
context:
space:
mode:
authorSonja Galovic <galovicsonja@gmail.com>2022-04-26 21:15:24 +0200
committerSonja Galovic <galovicsonja@gmail.com>2022-04-26 21:15:24 +0200
commit2c22d31667a4a5be24224651a570b1086d2ded7b (patch)
tree4e30cc22d12d97816ac17a540a00df89fcb58b57 /frontend/src/app/_pages/test
parent31e3b846eda94de86e249956d96c54aaa92eb0c6 (diff)
parent5857e1c71eda1ee6455d55ef9f8d1c10f75a8457 (diff)
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts: # frontend/src/app/_elements/column-table/column-table.component.css # frontend/src/app/_elements/column-table/column-table.component.ts
Diffstat (limited to 'frontend/src/app/_pages/test')
-rw-r--r--frontend/src/app/_pages/test/test.component.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/frontend/src/app/_pages/test/test.component.html b/frontend/src/app/_pages/test/test.component.html
index 625739f8..ec6ef0d6 100644
--- a/frontend/src/app/_pages/test/test.component.html
+++ b/frontend/src/app/_pages/test/test.component.html
@@ -1,3 +1,4 @@
<app-pie-chart></app-pie-chart>
<app-doughnut-chart></app-doughnut-chart>
-<app-barchart></app-barchart> \ No newline at end of file
+<app-barchart></app-barchart>
+<app-box-plot></app-box-plot> \ No newline at end of file