Merge branch 'redesign-exp-fixed' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/package-lock.json
#	frontend/src/app/_elements/folder/folder.component.html
#	frontend/src/app/_elements/form-dataset/form-dataset.component.html
#	frontend/src/app/_pages/experiment/experiment.component.html

1 files changed, 4 insertions, 0 deletions

diff --git a/frontend/src/app/_services/experiments.service.ts b/frontend/src/app/_services/experiments.service.ts
index bdaf62a7..ce112498 100644
--- a/frontend/src/app/_services/experiments.service.ts
+++ b/frontend/src/app/_services/experiments.service.ts
@@ -19,4 +19,8 @@ export class ExperimentsService {
   getMyExperiments(): Observable<Experiment[]> {
     return this.http.get<Experiment[]>(`${Configuration.settings.apiURL}/experiment/getmyexperiments`, { headers: this.authService.authHeader() });
   }
+
+  /*updateExperiment(){
+
+  }*/
 }