From dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Wed, 2 Mar 2022 23:38:27 +0100 Subject: Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara # Conflicts: # .gitignore --- sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico | Bin 0 -> 948 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico (limited to 'sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico') diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico b/sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico new file mode 100755 index 00000000..997406ad Binary files /dev/null and b/sandbox/TestIvanLjubisavljevic/frontend/src/favicon.ico differ -- cgit v1.2.3