DKaverznev 310976e7d4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/res/drawable/button_beigestroke_whitefill.xml
#	app/src/main/res/drawable/res_success.xml
#	app/src/main/res/layout/fragment_admin.xml
#	app/src/main/res/layout/fragment_main.xml
#	app/src/main/res/layout/fragment_scan_result.xml
2025-02-20 11:50:25 +03:00
..
2025-02-18 18:23:46 +03:00
2025-02-18 18:23:46 +03:00
2025-02-18 18:23:46 +03:00