Merge remote-tracking branch 'origin/master'
# Conflicts: # build.gradle.kts
This commit is contained in:
commit
65ddd11101
10 files changed
+45
-72
No files matched your search
Generated
-1
@@ -1,4 +1,3 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
|
||||
Reference in new issue
Block a user