diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 16:00:13 +0100 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-08 16:00:13 +0100 |
| commit | 6181721dc548421ec2926c17a73f0d48a2c99482 (patch) | |
| tree | 428f090f1d20cc0b4a2865fdc2fdbf5f8af38fbc /Backend | |
| parent | 6871fda74dbb4f3ba5442e80cfe3ea913a0ac92c (diff) | |
| parent | b13c1db6f45aeac73118efd4e13a5c44f0d7bd38 (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
# Conflicts:
# Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
Diffstat (limited to 'Backend')
0 files changed, 0 insertions, 0 deletions