Skip to content

Commit 108c660

Browse files
authored
Merge pull request #137 from THIP-TextHip/develop
[RELEASE] v1.2.1 메인 브랜치에 머지
2 parents afdfdae + e8141b0 commit 108c660

File tree

445 files changed

+35774
-1341
lines changed

Some content is hidden

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

445 files changed

+35774
-1341
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@
1313
.externalNativeBuild
1414
.cxx
1515
local.properties
16+
.idea/deploymentTargetSelector.xml
17+
.idea/misc.xml
18+
.idea/gradle.xml
19+
.idea/appInsightsSettings.xml
20+
/app/google-services.json
21+
*.properties
22+
*.jks

.idea/.gitignore

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

.idea/appInsightsSettings.xml

Lines changed: 18 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/Project.xml

Lines changed: 158 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

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

.idea/deviceManager.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)