diff options
| author | Nevena Bojovic <nenabojov@gmail.com> | 2022-04-06 21:20:32 +0200 |
|---|---|---|
| committer | Nevena Bojovic <nenabojov@gmail.com> | 2022-04-06 21:20:32 +0200 |
| commit | 8295292c8f593ec7ab9dd527ad8afce0bc474364 (patch) | |
| tree | b381a151784856d3f0e40c751d96ec012321f8a1 /frontend/src/app/_elements/item-predictor/item-predictor.component.ts | |
| parent | 45201c5c388b4988af3b319d6702c60397929dfc (diff) | |
| parent | 499f641683767d2da735fb760c89f0c611e37596 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# backend/api/api/appsettings.json
Diffstat (limited to 'frontend/src/app/_elements/item-predictor/item-predictor.component.ts')
0 files changed, 0 insertions, 0 deletions