diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-02 22:42:24 +0000 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-02 22:42:24 +0000 |
| commit | ee11a13a99d5635eb27850bcd909b73e6f50fced (patch) | |
| tree | 56993e2605de1a6cee6e4fdc082751b95e071da2 | |
| parent | dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd (diff) | |
| parent | 93035a65ba62f664af690d7006b7635e02e90d48 (diff) | |
Merge branch 'dev' into 'Tamara'
# Conflicts:
# .gitignore
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -4,5 +4,4 @@ sandbox/test-projekat-danijel/backend/.vs/ sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/bin/ sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/obj/ sandbox/TestTamara/TestTamara/TestTamara/obj/ -sandbox/TestTamara/TestTamara/TestTamara/bin/ - +sandbox/TestTamara/TestTamara/TestTamara/bin/
\ No newline at end of file |