diff options
| author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-07 02:23:06 +0100 |
|---|---|---|
| committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-07 02:23:06 +0100 |
| commit | 4e833f3651e304d35f91f43a3d46112f10873f45 (patch) | |
| tree | d15b65ce1958157f28ada9fa5fa8311605e00f62 /Client/.gitkeep | |
| parent | 3a6537bc3060d818d522e33f03321fd8aba1c0d9 (diff) | |
| parent | f12280f2396d424ca43893a32939b1b016158b7b (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 'Client/.gitkeep')
0 files changed, 0 insertions, 0 deletions