diff options
| author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-29 10:54:28 +0100 |
|---|---|---|
| committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-11-29 10:54:28 +0100 |
| commit | f062de86e3e0694ce68a89c923dac5d539f1f05e (patch) | |
| tree | 446c0279fdfc644917b0c6e5811bfaa596495199 /Backend | |
| parent | 75ff22fde1e7ebc566f54a7d9271923ac156ab89 (diff) | |
| parent | efc660578a44173fe035f60257ac552d7ed4f528 (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
# Conflicts:
# Client/BrzoDoLokacije/app/src/main/res/layout/chat_message.xml
# Client/BrzoDoLokacije/app/src/main/res/layout/chat_message_other.xml
Diffstat (limited to 'Backend')
0 files changed, 0 insertions, 0 deletions