diff options
author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-10 01:05:46 +0100 |
---|---|---|
committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-11-10 01:05:46 +0100 |
commit | c03ddf6b069c4d4f4521c7447ec685bf7b3036dc (patch) | |
tree | 1dabfb8fc3d9408797e51b23722e9673d91e79fd /Backend/Api/Api.sln | |
parent | 0b8ea0f9e323dfe607f29dfb0d1aa625443ca9bd (diff) | |
parent | e5ff284cfc4b1944d13034ff183efef49f631e4b (diff) |
Merge branch 'master' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
# Conflicts:
# Client/BrzoDoLokacije/app/build.gradle
Diffstat (limited to 'Backend/Api/Api.sln')
0 files changed, 0 insertions, 0 deletions