diff options
| author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-12 19:14:11 +0100 |
|---|---|---|
| committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-12 19:14:11 +0100 |
| commit | 8c4af2e94047d26f0f44a8659928dd1c9b3e9727 (patch) | |
| tree | 43a8a68a29f538d2b03c2b639c734d6a0513be30 /Backend | |
| parent | e724e67c83fd5f4ef16560194db76eb09658c178 (diff) | |
| parent | b673740ec1eb777bf439aab37e7b058b5bb9e14f (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
# Conflicts:
# Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
Diffstat (limited to 'Backend')
0 files changed, 0 insertions, 0 deletions