SergeyEzhin 3333037bf7 Remove conflict after merge		2021-07-27 12:06:52 +03:00
..
locale	Remove conflict after merge	2021-07-27 12:06:52 +03:00
resources/img
src	Remove conflict after merge	2021-07-27 12:06:52 +03:00