Compare commits

...

5 Commits

Author SHA1 Message Date
Igor I 6e477f136a Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop
# Conflicts:
#	.idea/caches/deviceStreaming.xml
#	app/build.gradle
2026-06-22 13:21:58 +05:00
Igor I 672186d738 settings 2026-06-22 13:19:58 +05:00
Igor I 28d624d5c3 settings 2026-06-22 13:18:52 +05:00
igor 1159cccdae Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.asdc into develop 2026-06-21 14:57:01 +05:00
igor 64295047f6 compileSdk 35 2026-06-21 14:56:46 +05:00

Diff Content Not Available