Merge branch 'master' of https://git.dirt.kz/igor/ASDC

# Conflicts: # app/src/main/res/layout-land/activity_locust_health.xml # app/src/main/res/layout-large/activity_locust_health.xml # app/src/main/res/layout/activity_locust_health.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values/strings.xml
2024-06-28 09:23:09 +05:00
parent 88384d9ead ce9fbe69eb
commit 3ec24fb3d5
1 changed files with 1 additions and 0 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">