Commit graph

2 commits

Author SHA1 Message Date
albexk
92db453f81 Merge branch 'dev' into refactoring-android
# Conflicts:
#	client/CMakeLists.txt
2023-08-19 14:52:39 +03:00
albexk
2c517de5bb Move Android part of cmake to a separate file 2023-08-18 22:26:43 +03:00