Skip to content

Commit 183c5c3

Browse files
author
Николай Капустин
committed
Merge branch 'develop' into 'master'
Обновление SDK See merge request frontend/android-sdk!43
2 parents ceca4b9 + dd28a91 commit 183c5c3

116 files changed

Lines changed: 4835 additions & 4355 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
.cxx
1616
local.properties
1717
.env
18+
sdktest/.idea

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 123 deletions
This file was deleted.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)